fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Electroblob
2018-06-20 23:58:50 +01:00
parent c3abdcf68b
commit c7c7d57e7e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/entity/living/EntityWizard.java
+3 -2
View File
@@ -158,10 +158,11 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
if((entity instanceof IMob || entity instanceof ISummonedCreature if((entity instanceof IMob || entity instanceof ISummonedCreature
// ... or in the whitelist ... // ... or in the whitelist ...
|| Arrays.asList(Wizardry.settings.summonedCreatureTargetsWhitelist) || Arrays.asList(Wizardry.settings.summonedCreatureTargetsWhitelist)
.contains(EntityList.getEntityString(entity).toLowerCase(Locale.ROOT))) .contains(EntityList.getKey(entity.getClass())))
// ... and isn't in the blacklist ... // ... and isn't in the blacklist ...
&& !Arrays.asList(Wizardry.settings.summonedCreatureTargetsBlacklist) && !Arrays.asList(Wizardry.settings.summonedCreatureTargetsBlacklist)
.contains(EntityList.getEntityString(entity).toLowerCase(Locale.ROOT))){ .contains(EntityList.getKey(entity.getClass()))){
// ... it can be attacked.
return true; return true;
} }
} }