Merge in Tuinity patches

This commit is contained in:
William Blake Galbreath
2020-03-08 12:49:59 -05:00
parent c8a65b216f
commit a32448bda1
140 changed files with 11159 additions and 1947 deletions

View File

@@ -0,0 +1,31 @@
From e9387426755d77b81b56818592f53b00c01e3a31 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 23:53:16 -0500
Subject: [PATCH] Fix cow rotation when shearing mooshroom
---
src/main/java/net/minecraft/server/EntityMushroomCow.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
index b20f4afd3..02d76a6c6 100644
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -118,7 +118,13 @@ public class EntityMushroomCow extends EntityCow {
entitycow.setPositionRotation(this.locX(), this.locY(), this.locZ(), this.yaw, this.pitch);
entitycow.setHealth(this.getHealth());
- entitycow.aI = this.aI;
+ // Purpur start - correctly copy rotation
+ entitycow.copyPositionRotation(this);
+ entitycow.setRenderYawOffset(this.getRenderYawOffset());
+ entitycow.setHeadRotation(this.getHeadRotation());
+ entitycow.lastYaw = this.lastYaw;
+ entitycow.lastPitch = this.lastPitch;
+ // Purpur end
if (this.hasCustomName()) {
entitycow.setCustomName(this.getCustomName());
entitycow.setCustomNameVisible(this.getCustomNameVisible());
--
2.24.0