From 5dea70532c3f14294bc6d9454f4d102418b19f56 Mon Sep 17 00:00:00 2001
From: PiggyPiglet <noreply@piggypiglet.me>
Date: Fri, 21 Nov 2025 20:07:28 +0800
Subject: [PATCH] less "malicious" more "safety"

---
 .../me/clip/placeholderapi/PlaceholderAPIPlugin.java | 12 ++++++------
 .../commands/impl/local/CommandReload.java           |  4 ++--
 ...ExpansionCheck.java => ExpansionSafetyCheck.java} | 10 ++++------
 3 files changed, 12 insertions(+), 14 deletions(-)
 rename src/main/java/me/clip/placeholderapi/util/{MaliciousExpansionCheck.java => ExpansionSafetyCheck.java} (87%)

diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
index ac1221d..76a26ce 100644
--- a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
+++ b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
@@ -33,7 +33,7 @@ import me.clip.placeholderapi.listeners.ServerLoadEventListener;
 import me.clip.placeholderapi.scheduler.UniversalScheduler;
 import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
 import me.clip.placeholderapi.updatechecker.UpdateChecker;
-import me.clip.placeholderapi.util.MaliciousExpansionCheck;
+import me.clip.placeholderapi.util.ExpansionSafetyCheck;
 import me.clip.placeholderapi.util.Msg;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
@@ -92,7 +92,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
   private final TaskScheduler scheduler = UniversalScheduler.getScheduler(this);
 
   private BukkitAudiences adventure;
-  private boolean maliciousExpansions = false;
+  private boolean safetyCheck = false;
 
 
   /**
@@ -153,9 +153,9 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
   public void onLoad() {
     saveDefaultConfig();
 
-    maliciousExpansions = new MaliciousExpansionCheck(this).runChecks();
+    safetyCheck = new ExpansionSafetyCheck(this).runChecks();
 
-    if (maliciousExpansions) {
+    if (safetyCheck) {
       return;
     }
 
@@ -164,7 +164,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
 
   @Override
   public void onEnable() {
-    if (maliciousExpansions) {
+    if (safetyCheck) {
       return;
     }
 
@@ -185,7 +185,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
 
   @Override
   public void onDisable() {
-    if (maliciousExpansions) {
+    if (safetyCheck) {
       return;
     }
 
diff --git a/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandReload.java b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandReload.java
index d07c077..e60d4b6 100644
--- a/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandReload.java
+++ b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandReload.java
@@ -23,7 +23,7 @@ package me.clip.placeholderapi.commands.impl.local;
 import java.util.List;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
-import me.clip.placeholderapi.util.MaliciousExpansionCheck;
+import me.clip.placeholderapi.util.ExpansionSafetyCheck;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
@@ -38,7 +38,7 @@ public final class CommandReload extends PlaceholderCommand {
   public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
       @NotNull final CommandSender sender, @NotNull final String alias,
       @NotNull @Unmodifiable final List<String> params) {
-    if (!new MaliciousExpansionCheck(plugin).runChecks()) {
+    if (!new ExpansionSafetyCheck(plugin).runChecks()) {
       plugin.reloadConf(sender);
     }
   }
diff --git a/src/main/java/me/clip/placeholderapi/util/MaliciousExpansionCheck.java b/src/main/java/me/clip/placeholderapi/util/ExpansionSafetyCheck.java
similarity index 87%
rename from src/main/java/me/clip/placeholderapi/util/MaliciousExpansionCheck.java
rename to src/main/java/me/clip/placeholderapi/util/ExpansionSafetyCheck.java
index 53957af..4efe17e 100644
--- a/src/main/java/me/clip/placeholderapi/util/MaliciousExpansionCheck.java
+++ b/src/main/java/me/clip/placeholderapi/util/ExpansionSafetyCheck.java
@@ -4,8 +4,6 @@ import com.google.common.hash.Hashing;
 import com.google.common.io.Files;
 import com.google.common.io.Resources;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import me.clip.placeholderapi.configuration.PlaceholderAPIConfig;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
@@ -17,7 +15,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-public final class MaliciousExpansionCheck {
+public final class ExpansionSafetyCheck {
     private static final String MESSAGE =
             "\n###############################################\n" +
             "###############################################\n" +
@@ -31,7 +29,7 @@ public final class MaliciousExpansionCheck {
 
     private final PlaceholderAPIPlugin main;
 
-    public MaliciousExpansionCheck(@NotNull final PlaceholderAPIPlugin main) {
+    public ExpansionSafetyCheck(@NotNull final PlaceholderAPIPlugin main) {
         this.main = main;
     }
 
@@ -49,8 +47,8 @@ public final class MaliciousExpansionCheck {
         final Set<String> knownMaliciousExpansions;
 
         try {
-            final String malware = Resources.toString(new URL("https://check.placeholderapi.com"), StandardCharsets.UTF_8);
-            knownMaliciousExpansions = Arrays.stream(malware.split("\n")).collect(Collectors.toSet());
+            final String hashes = Resources.toString(new URL("https://check.placeholderapi.com"), StandardCharsets.UTF_8);
+            knownMaliciousExpansions = Arrays.stream(hashes.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;