From b8e0836a6d419d4dc2c77539e4dddf26b7c937fc Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Fri, 4 Jan 2019 20:48:03 +0000 Subject: [PATCH] Add test for fake players in retaliatory ice shroud effect, fixes #93 --- src/main/java/electroblob/wizardry/WizardryEventHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/electroblob/wizardry/WizardryEventHandler.java b/src/main/java/electroblob/wizardry/WizardryEventHandler.java index b3799275..6c482b53 100644 --- a/src/main/java/electroblob/wizardry/WizardryEventHandler.java +++ b/src/main/java/electroblob/wizardry/WizardryEventHandler.java @@ -50,6 +50,7 @@ import net.minecraft.world.storage.loot.LootPool; import net.minecraft.world.storage.loot.RandomValueRange; import net.minecraft.world.storage.loot.conditions.LootCondition; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent; @@ -199,7 +200,8 @@ public final class WizardryEventHandler { // Ice Shroud if(event.getEntityLiving().isPotionActive(WizardryPotions.ice_shroud) - && !MagicDamage.isEntityImmune(DamageType.FROST, event.getEntityLiving())) + && !MagicDamage.isEntityImmune(DamageType.FROST, event.getEntityLiving()) + && !(event.getEntityLiving() instanceof FakePlayer)) attacker.addPotionEffect(new PotionEffect(WizardryPotions.frost, 100, 0)); // Static Aura