From 4e6780a3cfdb47213cdb4bf95619eea5a71c08b0 Mon Sep 17 00:00:00 2001
From: Electroblob <35599699+Electroblob77@users.noreply.github.com>
Date: Sun, 3 Jun 2018 18:19:10 +0100
Subject: [PATCH] Replace getEntityString with getKey(...).toString()

---
 .../electroblob/wizardry/entity/living/EntityEvilWizard.java  | 4 ++--
 .../java/electroblob/wizardry/entity/living/EntityWizard.java | 4 ++--
 .../electroblob/wizardry/entity/living/ISummonedCreature.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java b/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java
index 30cb09d8..020db8fb 100644
--- a/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java
+++ b/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java
@@ -118,10 +118,10 @@ public class EntityEvilWizard extends EntityMob implements ISpellCaster, IEntity
 							|| (entity instanceof ISummonedCreature || entity instanceof EntityWizard
 					// ... or in the whitelist ...
 									|| 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 ...
 									&& !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.
 						return true;
 					}
diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java b/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java
index b34c5a5f..eb7ad7d3 100644
--- a/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java
+++ b/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java
@@ -162,10 +162,10 @@ public class EntityWizard extends EntityVillager implements ISpellCaster, IEntit
 					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()).toString().toLowerCase(Locale.ROOT)))
 							// ... and isn't in the blacklist ...
 							&& !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.
 						return true;
 					}
diff --git a/src/main/java/electroblob/wizardry/entity/living/ISummonedCreature.java b/src/main/java/electroblob/wizardry/entity/living/ISummonedCreature.java
index 792d6382..092a7dd5 100644
--- a/src/main/java/electroblob/wizardry/entity/living/ISummonedCreature.java
+++ b/src/main/java/electroblob/wizardry/entity/living/ISummonedCreature.java
@@ -190,10 +190,10 @@ public interface ISummonedCreature extends IEntityAdditionalSpawnData {
 							|| (entity instanceof EntityWizard && !(getCaster() instanceof EntityWizard))
 					// ... or in the whitelist ...
 							|| 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 ...
 							&& !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.
 						return true;
 					}