From c7c7d57e7e13c35cf0ab9b267fb0b8957b030e86 Mon Sep 17 00:00:00 2001 From: Electroblob <35599699+Electroblob77@users.noreply.github.com> Date: Wed, 20 Jun 2018 23:58:50 +0100 Subject: [PATCH] Change target blacklist/whitelist checking to use the correct method for retrieving an entity key from EntityList --- .../electroblob/wizardry/entity/living/EntityWizard.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java b/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java index 9114aeba..7214304e 100644 --- a/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java +++ b/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java @@ -158,10 +158,11 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp if((entity instanceof IMob || entity instanceof ISummonedCreature // ... or in the whitelist ... || Arrays.asList(Wizardry.settings.summonedCreatureTargetsWhitelist) - .contains(EntityList.getEntityString(entity).toLowerCase(Locale.ROOT))) + .contains(EntityList.getKey(entity.getClass()))) // ... and isn't in the blacklist ... && !Arrays.asList(Wizardry.settings.summonedCreatureTargetsBlacklist) - .contains(EntityList.getEntityString(entity).toLowerCase(Locale.ROOT))){ + .contains(EntityList.getKey(entity.getClass()))){ + // ... it can be attacked. return true; } }