fix and use XentityType

xGinko · Aug 1, 2024 · 2e71f89 · 2e71f89
1 parent 42555c9
commit 2e71f89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/chunklimits/VillagerLimit.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/chunklimits/VillagerLimit.java
@@ -135,9 +135,11 @@ private void checkVillagersInChunk(Chunk chunk) {
         // Create a list with all villagers in that chunk
         final List<Villager> villagers_in_chunk = new ArrayList<>();
         for (Entity entity : entities) {
-            Villager villager = (Villager) entity;
-            if (whitelistEnabled && !professionWhitelist.contains(villager.getProfession())) {
-                villagers_in_chunk.add(villager);
+            if (entity.getType() == XEntityType.VILLAGER.get()) {
+                Villager villager = (Villager) entity;
+                if (whitelistEnabled && !professionWhitelist.contains(villager.getProfession())) {
+                    villagers_in_chunk.add(villager);
+                }
             }
         }
 

diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/chunklimits/VillagerLimit.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/chunklimits/VillagerLimit.java
@@ -6,7 +6,6 @@
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Villager;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -132,7 +131,7 @@ private void checkVillagersInChunk(Chunk chunk) {
         // Create a list with all villagers in that chunk
         final List<Villager> villagers_in_chunk = new ArrayList<>();
         for (Entity entity : entities) {
-            if (entity.getType() == EntityType.VILLAGER) {
+            if (entity.getType() == XEntityType.VILLAGER.get()) {
                 Villager villager = (Villager) entity;
                 if (whitelistEnabled && !professionWhitelist.contains(villager.getProfession())) {
                     villagers_in_chunk.add(villager);