diff --git a/patches/minecraft/net/minecraft/world/entity/animal/Bee.java.patch b/patches/minecraft/net/minecraft/world/entity/animal/Bee.java.patch index ad09699677..88f51188b9 100644 --- a/patches/minecraft/net/minecraft/world/entity/animal/Bee.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/animal/Bee.java.patch @@ -1,13 +1,5 @@ --- a/net/minecraft/world/entity/animal/Bee.java +++ b/net/minecraft/world/entity/animal/Bee.java -@@ -212,6 +_,7 @@ - this.f_27710_ = p_27793_.m_128451_("TicksSincePollination"); - this.f_27711_ = p_27793_.m_128451_("CannotEnterHiveTicks"); - this.f_27712_ = p_27793_.m_128451_("CropsGrownSincePollination"); -+ if(!f_19853_.f_46443_) //FORGE: allow this entity to be read from nbt on client. (Fixes MC-189565) - this.m_147285_(this.f_19853_, p_27793_); - } - @@ -469,7 +_,7 @@ return false; } else { diff --git a/patches/minecraft/net/minecraft/world/entity/animal/IronGolem.java.patch b/patches/minecraft/net/minecraft/world/entity/animal/IronGolem.java.patch index 0a8f3ad380..9d3d94148e 100644 --- a/patches/minecraft/net/minecraft/world/entity/animal/IronGolem.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/animal/IronGolem.java.patch @@ -13,11 +13,3 @@ } } -@@ -148,6 +_,7 @@ - public void m_7378_(CompoundTag p_28857_) { - super.m_7378_(p_28857_); - this.m_28887_(p_28857_.m_128471_("PlayerCreated")); -+ if(!f_19853_.f_46443_) //FORGE: allow this entity to be read from nbt on client. (Fixes MC-189565) - this.m_147285_(this.f_19853_, p_28857_); - } - diff --git a/patches/minecraft/net/minecraft/world/entity/animal/PolarBear.java.patch b/patches/minecraft/net/minecraft/world/entity/animal/PolarBear.java.patch deleted file mode 100644 index e1443c5712..0000000000 --- a/patches/minecraft/net/minecraft/world/entity/animal/PolarBear.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/net/minecraft/world/entity/animal/PolarBear.java -+++ b/net/minecraft/world/entity/animal/PolarBear.java -@@ -105,6 +_,7 @@ - - public void m_7378_(CompoundTag p_29541_) { - super.m_7378_(p_29541_); -+ if(!f_19853_.f_46443_) //FORGE: allow this entity to be read from nbt on client. (Fixes MC-189565) - this.m_147285_(this.f_19853_, p_29541_); - } - diff --git a/patches/minecraft/net/minecraft/world/entity/animal/Wolf.java.patch b/patches/minecraft/net/minecraft/world/entity/animal/Wolf.java.patch index daf5485055..c1731838b2 100644 --- a/patches/minecraft/net/minecraft/world/entity/animal/Wolf.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/animal/Wolf.java.patch @@ -1,13 +1,5 @@ --- a/net/minecraft/world/entity/animal/Wolf.java +++ b/net/minecraft/world/entity/animal/Wolf.java -@@ -136,6 +_,7 @@ - this.m_30397_(DyeColor.m_41053_(p_30402_.m_128451_("CollarColor"))); - } - -+ if(!f_19853_.f_46443_) //FORGE: allow this entity to be read from nbt on client. (Fixes MC-189565) - this.m_147285_(this.f_19853_, p_30402_); - } - @@ -348,7 +_,7 @@ itemstack.m_41774_(1); } diff --git a/patches/minecraft/net/minecraft/world/entity/monster/EnderMan.java.patch b/patches/minecraft/net/minecraft/world/entity/monster/EnderMan.java.patch index b7d50d14f6..5c989c6e35 100644 --- a/patches/minecraft/net/minecraft/world/entity/monster/EnderMan.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/monster/EnderMan.java.patch @@ -16,13 +16,7 @@ } protected void m_8097_() { -@@ -181,12 +_,13 @@ - } - - this.m_32521_(blockstate); -+ if(!f_19853_.f_46443_) //FORGE: allow this entity to be read from nbt on client. (Fixes MC-189565) - this.m_147285_(this.f_19853_, p_32511_); - } +@@ -186,7 +_,7 @@ boolean m_32534_(Player p_32535_) { ItemStack itemstack = p_32535_.m_150109_().f_35975_.get(3); diff --git a/patches/minecraft/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch b/patches/minecraft/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch deleted file mode 100644 index 563978bdd0..0000000000 --- a/patches/minecraft/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/net/minecraft/world/entity/monster/ZombifiedPiglin.java -+++ b/net/minecraft/world/entity/monster/ZombifiedPiglin.java -@@ -175,6 +_,7 @@ - - public void m_7378_(CompoundTag p_34446_) { - super.m_7378_(p_34446_); -+ if(!f_19853_.f_46443_) //FORGE: allow this entity to be read from nbt on client. (Fixes MC-189565) - this.m_147285_(this.f_19853_, p_34446_); - } -