From 4524435e25aaecce06397e990a8b9fef955f94f3 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 11 Sep 2012 15:51:26 -0700 Subject: [PATCH] Fix a few patch fuzzes --- patches/common/net/minecraft/src/EntityPlayer.java.patch | 2 +- .../minecraft/net/minecraft/src/NetClientHandler.java.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/common/net/minecraft/src/EntityPlayer.java.patch b/patches/common/net/minecraft/src/EntityPlayer.java.patch index fd0a08802..e70fb6b18 100644 --- a/patches/common/net/minecraft/src/EntityPlayer.java.patch +++ b/patches/common/net/minecraft/src/EntityPlayer.java.patch @@ -83,7 +83,7 @@ /** @@ -688,18 +724,33 @@ */ - protected void joinEntityItemWithWorld(EntityItem par1EntityItem) + public void joinEntityItemWithWorld(EntityItem par1EntityItem) { - this.worldObj.spawnEntityInWorld(par1EntityItem); + if (captureDrops) diff --git a/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch b/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch index 04b1c67c2..8ebf4f42c 100644 --- a/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch +++ b/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch @@ -21,7 +21,7 @@ this.field_72554_f = true; this.mc.loadWorld((WorldClient)null); this.mc.displayGuiScreen(new GuiDisconnected("disconnect.disconnected", "disconnect.genericReason", new Object[] {par1Packet255KickDisconnect.reason})); -@@ -658,7 +663,11 @@ +@@ -659,7 +664,11 @@ public void handleChat(Packet3Chat par1Packet3Chat) { par1Packet3Chat = FMLNetworkHandler.handleChatMessage(this, par1Packet3Chat); @@ -34,7 +34,7 @@ } public void handleAnimation(Packet18Animation par1Packet18Animation) -@@ -1013,6 +1022,19 @@ +@@ -1014,6 +1023,19 @@ { ((TileEntityMobSpawner)var2).readFromNBT(par1Packet132TileEntityData.customParam1); }