Fixed SpawnerKiller bl wl

+ Fixed SpawnerKiller Blacklist/whitelist issue. Related #78
Geik-xyz · Aug 9, 2024 · 0d56324 · 0d56324
1 parent b8a5e87
commit 0d56324
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/main/java/xyz/geik/farmer/modules/spawnerkiller/SpawnerKiller.java b/src/main/java/xyz/geik/farmer/modules/spawnerkiller/SpawnerKiller.java
@@ -28,9 +28,9 @@ public SpawnerKiller() {}
 
     private static SpawnerKillerGuiCreateEvent spawnerKillerGuiCreateEvent;
 
-    private List<String> whitelist = new ArrayList<>();
+    private final List<String> whitelist = new ArrayList<>();
 
-    private List<String> blacklist = new ArrayList<>();
+    private final List<String> blacklist = new ArrayList<>();
 
     private boolean requireFarmer = false, cookFoods = false, removeMob = true, defaultStatus = false;
 
@@ -58,9 +58,9 @@ public void onEnable() {
         cookFoods = Main.getModulesFile().getSpawnerKiller().isCookFoods();
         requireFarmer = Main.getModulesFile().getSpawnerKiller().isRequireFarmer();
         if (Main.getModulesFile().getSpawnerKiller().getMode().equals("whitelist"))
-            getLang().getTextList("settings.whitelist").forEach(whitelist::add);
+            whitelist.addAll(Main.getModulesFile().getSpawnerKiller().getWhitelist());
         if (Main.getModulesFile().getSpawnerKiller().getMode().equals("blacklist"))
-            getLang().getTextList("settings.blacklist").forEach(blacklist::add);
+            blacklist.addAll(Main.getModulesFile().getSpawnerKiller().getBlacklist());
     }
 
     /**

diff --git a/src/main/java/xyz/geik/farmer/modules/spawnerkiller/handlers/SpawnerKillerEvent.java b/src/main/java/xyz/geik/farmer/modules/spawnerkiller/handlers/SpawnerKillerEvent.java
@@ -42,12 +42,10 @@ public SpawnerKillerEvent() {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onCreatureEvent(@NotNull CreatureSpawnEvent e) {
         Entity en = e.getEntity();
-        if (en instanceof Damageable) {
-            if (e.getSpawnReason().equals(CreatureSpawnEvent.SpawnReason.MOUNT)
-                    || e.getSpawnReason().equals(CreatureSpawnEvent.SpawnReason.JOCKEY))
-                e.setCancelled(true);
+        if (e.getSpawnReason().equals(CreatureSpawnEvent.SpawnReason.MOUNT)
+                || e.getSpawnReason().equals(CreatureSpawnEvent.SpawnReason.JOCKEY))
+            e.setCancelled(true);
 
-        }
     }
 
     /**

diff --git a/src/main/java/xyz/geik/farmer/modules/spawnerkiller/handlers/SpawnerMetaEvent.java b/src/main/java/xyz/geik/farmer/modules/spawnerkiller/handlers/SpawnerMetaEvent.java
@@ -34,7 +34,7 @@ public SpawnerMetaEvent() {
             return;
 
         SpawnerMeta sm = (SpawnerMeta) Bukkit.getPluginManager().getPlugin("SpawnerMeta");
-
+        assert sm != null;
         APIInstance api = sm.getAPI();
 
         api.register(SpawnerPostSpawnEvent.class, e -> {