sync with 16

Ivan-1F · Feb 26, 2021 · 8abd350 · 8abd350
1 parent 5f37e24
commit 8abd350
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/.../java/me/ivan/ivancarpetaddition/mixins/rule/mobSpawningRestriction/ServerWorldMixin.java b/.../java/me/ivan/ivancarpetaddition/mixins/rule/mobSpawningRestriction/ServerWorldMixin.java
@@ -18,15 +18,19 @@ public class ServerWorldMixin {
     private void spawnEntity(Entity entity, CallbackInfoReturnable<Boolean> cir) {
         if (IvanCarpetAdditionSettings.mobSpawningRestrictionMode.equals("blacklist")) {
             Set<String> blackList = Sets.newLinkedHashSet(Arrays.asList(IvanCarpetAdditionSettings.mobBlackList.split(",")));
-            if (blackList.contains(entity.getName().getString().toLowerCase())) {
-                cir.setReturnValue(false);
-            }
+            blackList.forEach(name -> {
+                if (entity.getType().getTranslationKey().contains(name)) {
+                    cir.setReturnValue(false);
+                }
+            });
         }
         if (IvanCarpetAdditionSettings.mobSpawningRestrictionMode.equals("whitelist")) {
             Set<String> whitelist = Sets.newLinkedHashSet(Arrays.asList(IvanCarpetAdditionSettings.mobWhiteList.split(",")));
-            if (!whitelist.contains(entity.getName().getString().toLowerCase())) {
-                cir.setReturnValue(false);
-            }
+            whitelist.forEach(name -> {
+                if (!entity.getType().getTranslationKey().contains(name)) {
+                    cir.setReturnValue(false);
+                }
+            });
         }
     }
 }