Change target blacklist/whitelist checking to use the correct method for retrieving an entity key from EntityList

This commit is contained in:
Electroblob
2018-06-20 23:58:50 +01:00
parent c3abdcf68b
commit c7c7d57e7e
@@ -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;
}
}