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

Replace getEntityString with getKey(...).toString()

Browse Source
This commit is contained in:
Electroblob
2018-06-03 18:19:10 +01:00
parent 00584ad635
commit 4e6780a3cf
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java
+2 -2
View File
@@ -118,10 +118,10 @@ public class EntityEvilWizard extends EntityMob implements ISpellCaster, IEntity
|| (entity instanceof ISummonedCreature || entity instanceof EntityWizard || (entity instanceof ISummonedCreature || entity instanceof EntityWizard
// ... 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()).toString().toLowerCase(Locale.ROOT)))
// ... 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()).toString().toLowerCase(Locale.ROOT))){
// ... it can be attacked. // ... it can be attacked.
return true; return true;
} }
src/main/java/electroblob/wizardry/entity/living/EntityWizard.java
+2 -2
View File
@@ -162,10 +162,10 @@ public class EntityWizard extends EntityVillager implements ISpellCaster, IEntit
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()).toString().toLowerCase(Locale.ROOT)))
// ... 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()).toString().toLowerCase(Locale.ROOT))){
// ... it can be attacked. // ... it can be attacked.
return true; return true;
} }
src/main/java/electroblob/wizardry/entity/living/ISummonedCreature.java
+2 -2
View File
@@ -190,10 +190,10 @@ public interface ISummonedCreature extends IEntityAdditionalSpawnData {
|| (entity instanceof EntityWizard && !(getCaster() instanceof EntityWizard)) || (entity instanceof EntityWizard && !(getCaster() instanceof EntityWizard))
// ... 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()).toString().toLowerCase(Locale.ROOT)))
// ... 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()).toString().toLowerCase(Locale.ROOT))){
// ... it can be attacked. // ... it can be attacked.
return true; return true;
} }