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

Updated FML: 

MinecraftForge/FML@23baf3a8ce Actually fix the nethandler code

Update patches
This commit is contained in:
Christian 2013-11-13 19:14:56 -05:00
parent 745d601831
commit 28abe2cc3c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fml

@ -1 +1 @@
Subproject commit da72640c7ef1f44c49f7f592fbdd193622a30b40 Subproject commit 23baf3a8ce58cb8306189401a60647957ccbb4c2

10
patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch
View File

@ -21,10 +21,10 @@
this.disconnected = true; this.disconnected = true;
this.mc.loadWorld((WorldClient)null); this.mc.loadWorld((WorldClient)null);
@@ -866,7 +871,11 @@ @@ -870,7 +875,11 @@
public void handleChat(Packet3Chat par1Packet3Chat) {
{ return;
par1Packet3Chat = FMLNetworkHandler.handleChatMessage(this, par1Packet3Chat); }
- this.mc.ingameGUI.getChatGUI().printChatMessage(ChatMessageComponent.createFromJson(par1Packet3Chat.message).toStringWithFormatting(true)); - this.mc.ingameGUI.getChatGUI().printChatMessage(ChatMessageComponent.createFromJson(par1Packet3Chat.message).toStringWithFormatting(true));
+ ClientChatReceivedEvent event = new ClientChatReceivedEvent(par1Packet3Chat.message); + ClientChatReceivedEvent event = new ClientChatReceivedEvent(par1Packet3Chat.message);
+ if (!MinecraftForge.EVENT_BUS.post(event) && event.message != null) + if (!MinecraftForge.EVENT_BUS.post(event) && event.message != null)
@ -34,7 +34,7 @@
} }
public void handleAnimation(Packet18Animation par1Packet18Animation) public void handleAnimation(Packet18Animation par1Packet18Animation)
@@ -1354,6 +1363,10 @@ @@ -1358,6 +1367,10 @@
{ {
tileentity.readFromNBT(par1Packet132TileEntityData.data); tileentity.readFromNBT(par1Packet132TileEntityData.data);
} }

4
patches/minecraft/net/minecraft/network/NetServerHandler.java.patch
View File

@ -127,7 +127,7 @@
{ {
this.playerEntity.theItemInWorldManager.activateBlockOrUseItem(this.playerEntity, worldserver, itemstack, i, j, k, l, par1Packet15Place.getXOffset(), par1Packet15Place.getYOffset(), par1Packet15Place.getZOffset()); this.playerEntity.theItemInWorldManager.activateBlockOrUseItem(this.playerEntity, worldserver, itemstack, i, j, k, l, par1Packet15Place.getXOffset(), par1Packet15Place.getYOffset(), par1Packet15Place.getZOffset());
} }
@@ -695,6 +733,8 @@ @@ -698,6 +736,8 @@
} }
ChatMessageComponent chatmessagecomponent = ChatMessageComponent.createFromTranslationWithSubstitutions("chat.type.text", new Object[] {this.playerEntity.getTranslatedEntityName(), s}); ChatMessageComponent chatmessagecomponent = ChatMessageComponent.createFromTranslationWithSubstitutions("chat.type.text", new Object[] {this.playerEntity.getTranslatedEntityName(), s});
@ -136,7 +136,7 @@
this.mcServer.getConfigurationManager().func_110459_a(chatmessagecomponent, false); this.mcServer.getConfigurationManager().func_110459_a(chatmessagecomponent, false);
} }
@@ -849,7 +889,7 @@ @@ -852,7 +892,7 @@
return; return;
} }