From 403adeb2170f47403e50123dc290797b54d34336 Mon Sep 17 00:00:00 2001
From: PiggyPiglet <noreply@piggypiglet.me>
Date: Fri, 21 Nov 2025 20:01:53 +0800
Subject: [PATCH] cube doesn't like calling it malware

---
 .../clip/placeholderapi/PlaceholderAPIPlugin.java  | 12 ++++++++----
 .../util/MaliciousExpansionCheck.java              | 14 +++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
index b176a6d..ac1221d 100644
--- a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
+++ b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
@@ -92,7 +92,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
   private final TaskScheduler scheduler = UniversalScheduler.getScheduler(this);
 
   private BukkitAudiences adventure;
-  private boolean malwareDetected = false;
+  private boolean maliciousExpansions = false;
 
 
   /**
@@ -153,9 +153,9 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
   public void onLoad() {
     saveDefaultConfig();
 
-    malwareDetected = new MaliciousExpansionCheck(this).runChecks();
+    maliciousExpansions = new MaliciousExpansionCheck(this).runChecks();
 
-    if (malwareDetected) {
+    if (maliciousExpansions) {
       return;
     }
 
@@ -164,7 +164,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
 
   @Override
   public void onEnable() {
-    if (malwareDetected) {
+    if (maliciousExpansions) {
       return;
     }
 
@@ -185,6 +185,10 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
 
   @Override
   public void onDisable() {
+    if (maliciousExpansions) {
+      return;
+    }
+
     getCloudExpansionManager().kill();
     getLocalExpansionManager().kill();
 
diff --git a/src/main/java/me/clip/placeholderapi/util/MaliciousExpansionCheck.java b/src/main/java/me/clip/placeholderapi/util/MaliciousExpansionCheck.java
index a813c3c..53957af 100644
--- a/src/main/java/me/clip/placeholderapi/util/MaliciousExpansionCheck.java
+++ b/src/main/java/me/clip/placeholderapi/util/MaliciousExpansionCheck.java
@@ -46,35 +46,35 @@ public final class MaliciousExpansionCheck {
             return false;
         }
 
-        final Set<String> knownMalware;
+        final Set<String> knownMaliciousExpansions;
 
         try {
             final String malware = Resources.toString(new URL("https://check.placeholderapi.com"), StandardCharsets.UTF_8);
-            knownMalware = Arrays.stream(malware.split("\n")).collect(Collectors.toSet());
+            knownMaliciousExpansions = Arrays.stream(malware.split("\n")).collect(Collectors.toSet());
         } catch (Exception e) {
             main.getLogger().log(Level.SEVERE, "Failed to download anti malware hash check list from https://check.placeholderapi.com", e);
             return false;
         }
 
-        final Set<String> malwarePaths = new HashSet<>();
+        final Set<String> maliciousPaths = new HashSet<>();
 
         for (File file : expansionsFolder.listFiles()) {
             try {
                 final String hash = Hashing.sha256().hashBytes(Files.asByteSource(file).read()).toString();
 
-                if (knownMalware.contains(hash)) {
-                    malwarePaths.add(file.getAbsolutePath());
+                if (knownMaliciousExpansions.contains(hash)) {
+                    maliciousPaths.add(file.getAbsolutePath());
                 }
             } catch (Exception e) {
                 main.getLogger().log(Level.SEVERE, "Error occurred while trying to read " + file.getAbsolutePath(), e);
             }
         }
 
-        if (malwarePaths.isEmpty()) {
+        if (maliciousPaths.isEmpty()) {
             return false;
         }
 
-        main.getLogger().severe(String.format(MESSAGE, malwarePaths.stream().map(p -> "HASH OF " + p + " MATCHES KNOWN MALICIOUS EXPANSION DELETE IMMEDIATELY\n").collect(Collectors.joining())));
+        main.getLogger().severe(String.format(MESSAGE, maliciousPaths.stream().map(p -> "HASH OF " + p + " MATCHES KNOWN MALICIOUS EXPANSION DELETE IMMEDIATELY\n").collect(Collectors.joining())));
 
         main.getServer().shutdown();
         return true;