diff --git a/patches/server/0034-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0034-Fix-cow-rotation-when-shearing-mooshroom.patch deleted file mode 100644 index adb11c0ac..000000000 --- a/patches/server/0034-Fix-cow-rotation-when-shearing-mooshroom.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Fri, 3 May 2019 23:53:16 -0500 -Subject: [PATCH] Fix cow rotation when shearing mooshroom - - -diff --git a/net/minecraft/world/entity/animal/MushroomCow.java b/net/minecraft/world/entity/animal/MushroomCow.java -index 215ec83077a1d40fdcee5bf4cd1af0d46fdd695e..96078cf11f13c85a3f019f70fa02668c43dbc559 100644 ---- a/net/minecraft/world/entity/animal/MushroomCow.java -+++ b/net/minecraft/world/entity/animal/MushroomCow.java -@@ -219,6 +219,13 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder { - world.sendParticles(ParticleTypes.EXPLOSION, this.getX(), this.getY(0.5D), this.getZ(), 1, 0.0D, 0.0D, 0.0D, 0.0D); -+ // Purpur start -+ entitycow.copyPosition(this); -+ entitycow.yBodyRot = this.yBodyRot; -+ entitycow.setYHeadRot(this.getYHeadRot()); -+ entitycow.yRotO = this.yRotO; -+ entitycow.xRotO = this.xRotO; -+ // Purpur end - // Paper start - custom shear drops; moved drop generation to separate method - drops.forEach(drop -> { - ItemEntity entityitem = new ItemEntity(this.level(), this.getX(), this.getY(1.0D), this.getZ(), drop); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/MushroomCow.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/MushroomCow.java.patch new file mode 100644 index 000000000..1d6651865 --- /dev/null +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/MushroomCow.java.patch @@ -0,0 +1,16 @@ +--- a/net/minecraft/world/entity/animal/MushroomCow.java ++++ b/net/minecraft/world/entity/animal/MushroomCow.java +@@ -192,6 +_,13 @@ + level.playSound(null, this, SoundEvents.MOOSHROOM_SHEAR, soundSource, 1.0F, 1.0F); + this.convertTo(EntityType.COW, ConversionParams.single(this, false, false), mob -> { + level.sendParticles(ParticleTypes.EXPLOSION, this.getX(), this.getY(0.5), this.getZ(), 1, 0.0, 0.0, 0.0, 0.0); ++ // Purpur start - Fix cow rotation when shearing mooshroom ++ mob.copyPosition(this); ++ mob.yBodyRot = this.yBodyRot; ++ mob.setYHeadRot(this.getYHeadRot()); ++ mob.yRotO = this.yRotO; ++ mob.xRotO = this.xRotO; ++ // Purpur end - Fix cow rotation when shearing mooshroom + // Paper start - custom shear drops; moved drop generation to separate method + drops.forEach(drop -> { + this.spawnAtLocation(level, new ItemEntity(this.level(), this.getX(), this.getY(1.0), this.getZ(), drop));