keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Limit some server to client update packets for Item Capabilities (#4252)

This commit is contained in:
P3pp3rF1y 2017-08-01 19:46:04 +02:00 committed by LexManos
parent 32e811bd7a
commit 8aa78da4de
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch
View File

@ -240,15 +240,17 @@
super.func_70071_h_();
this.func_184608_ct();
@@ -2097,6 +2121,7 @@
@@ -2096,7 +2120,9 @@
if (!ItemStack.func_77989_b(itemstack1, itemstack))
{
+ if (!ItemStack.areItemStacksEqualUsingNBTShareTag(itemstack1, itemstack))
((WorldServer)this.field_70170_p).func_73039_n().func_151247_a(this, new SPacketEntityEquipment(this.func_145782_y(), entityequipmentslot, itemstack1));
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.living.LivingEquipmentChangeEvent(this, entityequipmentslot, itemstack, itemstack1));
if (!itemstack.func_190926_b())
{
@@ -2575,6 +2600,40 @@
@@ -2575,6 +2601,40 @@
this.field_70752_e = true;
}
@ -289,7 +291,7 @@
public abstract EnumHandSide func_184591_cq();
public boolean func_184587_cr()
@@ -2595,12 +2654,19 @@
@@ -2595,12 +2655,19 @@
if (itemstack == this.field_184627_bm)
{
@ -310,7 +312,7 @@
{
this.func_71036_o();
}
@@ -2618,8 +2684,10 @@
@@ -2618,8 +2685,10 @@
if (!itemstack.func_190926_b() && !this.func_184587_cr())
{
@ -322,7 +324,7 @@
if (!this.field_70170_p.field_72995_K)
{
@@ -2700,7 +2768,9 @@
@@ -2700,7 +2769,9 @@
if (!this.field_184627_bm.func_190926_b() && this.func_184587_cr())
{
this.func_184584_a(this.field_184627_bm, 16);
@ -333,7 +335,7 @@
this.func_184602_cy();
}
}
@@ -2724,7 +2794,8 @@
@@ -2724,7 +2795,8 @@
{
if (!this.field_184627_bm.func_190926_b())
{
@ -343,7 +345,7 @@
}
this.func_184602_cy();
@@ -2852,6 +2923,31 @@
@@ -2852,6 +2924,31 @@
return true;
}

16
patches/minecraft/net/minecraft/inventory/Container.java.patch
View File

@ -1,6 +1,18 @@
--- ../src-base/minecraft/net/minecraft/inventory/Container.java
+++ ../src-work/minecraft/net/minecraft/inventory/Container.java
@@ -603,18 +603,19 @@
@@ -81,9 +81,11 @@
if (!ItemStack.func_77989_b(itemstack1, itemstack))
{
+ boolean clientStackChanged = !ItemStack.areItemStacksEqualUsingNBTShareTag(itemstack1, itemstack);
itemstack1 = itemstack.func_190926_b() ? ItemStack.field_190927_a : itemstack.func_77946_l();
this.field_75153_a.set(i, itemstack1);
+ if (clientStackChanged)
for (int j = 0; j < this.field_75149_d.size(); ++j)
{
((IContainerListener)this.field_75149_d.get(j)).func_71111_a(this, i, itemstack1);
@@ -603,18 +605,19 @@
if (!itemstack.func_190926_b() && itemstack.func_77973_b() == p_75135_1_.func_77973_b() && (!p_75135_1_.func_77981_g() || p_75135_1_.func_77960_j() == itemstack.func_77960_j()) && ItemStack.func_77970_a(p_75135_1_, itemstack))
{
int j = itemstack.func_190916_E() + p_75135_1_.func_190916_E();
@ -24,7 +36,7 @@
slot.func_75218_e();
flag = true;
}
@@ -752,7 +753,7 @@
@@ -752,7 +755,7 @@
p_94525_2_.func_190920_e(1);
break;
case 2: