xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Update to Forge 1343. Small fixes.

Browse Source
This commit is contained in:
gamerforEA
2015-03-30 10:25:29 +03:00
parent 3c203341c9
commit 6f8f13347d
16 changed files with 203 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java
+++ ../src-work/minecraft/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java
@@ -72,7 +72,7 @@
@@ -76,7 +76,7 @@
public static final AttributeKey<Boolean> IS_LOCAL = new AttributeKey<Boolean>("fml:isLocal");
public final NetworkManager manager;
private final ServerConfigurationManager scm;
@ -9,16 +9,16 @@
private ConnectionState state;
private ConnectionType connectionType;
private final Side side;
@@ -202,7 +202,7 @@
@@ -219,7 +219,7 @@
}
else
{
- FMLLog.info("Unexpected packet during modded negotiation - assuming vanilla or keepalives : %s", msg.getClass().getName());
+ //FMLLog.info("Unexpected packet during modded negotiation - assuming vanilla or keepalives : %s", msg.getClass().getName()); // Cauldron - unneeded spam
+ // FMLLog.info("Unexpected packet during modded negotiation - assuming vanilla or keepalives : %s", msg.getClass().getName());
}
return false;
}
@@ -287,6 +287,7 @@
@@ -304,6 +304,7 @@
state = ConnectionState.HANDSHAKING;
}
String channelName = msg.func_149559_c();
@ -26,7 +26,7 @@
if ("FML|HS".equals(channelName) || "REGISTER".equals(channelName) || "UNREGISTER".equals(channelName))
{
FMLProxyPacket proxy = new FMLProxyPacket(msg);
@@ -308,6 +309,7 @@
@@ -325,6 +326,7 @@
else if (NetworkRegistry.INSTANCE.hasChannel(channelName, Side.SERVER))
{
FMLProxyPacket proxy = new FMLProxyPacket(msg);
@ -34,12 +34,12 @@
proxy.setDispatcher(this);
context.fireChannelRead(proxy);
return true;
@@ -465,7 +467,7 @@
@@ -482,7 +484,7 @@
// Stop the epic channel closed spam at close
if (!(cause instanceof ClosedChannelException))
{
- FMLLog.log(Level.ERROR, cause, "NetworkDispatcher exception");
+ //FMLLog.log(Level.ERROR, cause, "NetworkDispatcher exception"); // Cauldron - disable unneeded spam
+ // FMLLog.log(Level.ERROR, cause, "NetworkDispatcher exception");
}
super.exceptionCaught(ctx, cause);
}

2
patches/cpw/mods/fml/common/registry/GameData.java.patch
View File

@ -10,7 +10,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -1024,4 +1026,56 @@
@@ -1025,4 +1027,56 @@
throw new RuntimeException("WHAT?");
}
}