From c115acf69d0bd176490e5acadc709d556d2ea110 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sat, 9 Feb 2019 19:46:16 +0200
Subject: [PATCH] Fixed hurt noises playing when disguises have a larger hitbox
 than changelings

---
 .../java/com/minelittlepony/unicopia/power/PowerDisguise.java | 3 ---
 .../java/com/minelittlepony/unicopia/spell/SpellDisguise.java | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerDisguise.java b/src/main/java/com/minelittlepony/unicopia/power/PowerDisguise.java
index fc24a6bc..736c7bba 100644
--- a/src/main/java/com/minelittlepony/unicopia/power/PowerDisguise.java
+++ b/src/main/java/com/minelittlepony/unicopia/power/PowerDisguise.java
@@ -1,12 +1,10 @@
 package com.minelittlepony.unicopia.power;
 
-import java.util.UUID;
 
 import javax.annotation.Nullable;
 
 import org.lwjgl.input.Keyboard;
 
-import com.minelittlepony.unicopia.UClient;
 import com.minelittlepony.unicopia.UParticles;
 import com.minelittlepony.unicopia.player.IPlayer;
 import com.minelittlepony.unicopia.player.PlayerSpeciesList;
@@ -14,7 +12,6 @@ import com.minelittlepony.unicopia.power.data.Hit;
 import com.minelittlepony.unicopia.spell.IMagicEffect;
 import com.minelittlepony.unicopia.spell.SpellDisguise;
 import com.minelittlepony.util.vector.VecHelper;
-import com.mojang.authlib.GameProfile;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellDisguise.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellDisguise.java
index 310dae36..bb4ab894 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellDisguise.java
+++ b/src/main/java/com/minelittlepony/unicopia/spell/SpellDisguise.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.Race;
 import com.minelittlepony.unicopia.UClient;
+import com.minelittlepony.unicopia.mixin.MixinEntity;
 import com.minelittlepony.unicopia.player.IOwned;
 import com.minelittlepony.unicopia.player.IPlayer;
 import com.minelittlepony.unicopia.player.PlayerSpeciesList;
@@ -194,10 +195,9 @@ public class SpellDisguise extends AbstractSpell {
                 entity.extinguish();
             }
 
+            entity.noClip = true;
             entity.updateBlocked = true;
 
-            owner.height = entity.height;
-
             entity.setSneaking(owner.isSneaking());
             entity.setInvisible(false);