PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-01 19:46:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed hurt noises playing when disguises have a larger hitbox than changelings

Browse source
This commit is contained in:
Sollace 2019-02-09 19:46:16 +02:00
parent 2cb44efba1
commit c115acf69d
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/minelittlepony/unicopia/power/PowerDisguise.java
View file

@ -1,12 +1,10 @@
package com.minelittlepony.unicopia.power; package com.minelittlepony.unicopia.power;
import java.util.UUID;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import com.minelittlepony.unicopia.UClient;
import com.minelittlepony.unicopia.UParticles; import com.minelittlepony.unicopia.UParticles;
import com.minelittlepony.unicopia.player.IPlayer; import com.minelittlepony.unicopia.player.IPlayer;
import com.minelittlepony.unicopia.player.PlayerSpeciesList; 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.IMagicEffect;
import com.minelittlepony.unicopia.spell.SpellDisguise; import com.minelittlepony.unicopia.spell.SpellDisguise;
import com.minelittlepony.util.vector.VecHelper; import com.minelittlepony.util.vector.VecHelper;
import com.mojang.authlib.GameProfile;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

4
src/main/java/com/minelittlepony/unicopia/spell/SpellDisguise.java
View file

@ -7,6 +7,7 @@ import javax.annotation.Nullable;
import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.Race;
import com.minelittlepony.unicopia.UClient; import com.minelittlepony.unicopia.UClient;
import com.minelittlepony.unicopia.mixin.MixinEntity;
import com.minelittlepony.unicopia.player.IOwned; import com.minelittlepony.unicopia.player.IOwned;
import com.minelittlepony.unicopia.player.IPlayer; import com.minelittlepony.unicopia.player.IPlayer;
import com.minelittlepony.unicopia.player.PlayerSpeciesList; import com.minelittlepony.unicopia.player.PlayerSpeciesList;
@ -194,10 +195,9 @@ public class SpellDisguise extends AbstractSpell {
entity.extinguish(); entity.extinguish();
} }
entity.noClip = true;
entity.updateBlocked = true; entity.updateBlocked = true;
owner.height = entity.height;
entity.setSneaking(owner.isSneaking()); entity.setSneaking(owner.isSneaking());
entity.setInvisible(false); entity.setInvisible(false);