mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
Remove neutral mob patches as the bug was fixed upstream. (#8001)
This commit is contained in:
1 parent
9746db5129
commit
1018b077dc
6 files changed
+1
-51
No files matched your search
@@ -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 {
|
||||
|
||||
@@ -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_);
|
||||
}
|
||||
|
||||
@@ -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_);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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_);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user