diff --git a/common/cpw/mods/fml/common/Loader.java b/common/cpw/mods/fml/common/Loader.java index 8236debcda..43c8d68405 100644 --- a/common/cpw/mods/fml/common/Loader.java +++ b/common/cpw/mods/fml/common/Loader.java @@ -415,7 +415,7 @@ public class Loader for (File file : content) { if (file.isDirectory()) { - log.finest(String.format("Recursing into subdirectory %s", file.getName())); + log.finest(String.format("Recursing into package %s", path+file.getName())); foundAModClass|=attemptDirLoad(file,path+file.getName()+"."); continue; } diff --git a/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch b/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch new file mode 100644 index 0000000000..86116f6c01 --- /dev/null +++ b/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch @@ -0,0 +1,20 @@ +--- ../src-base/minecraft_server/net/minecraft/src/NetLoginHandler.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src-work/minecraft_server/net/minecraft/src/NetLoginHandler.java 0000-00-00 00:00:00.000000000 -0000 +@@ -5,6 +5,8 @@ + import java.util.Iterator; + import java.util.Random; + import java.util.logging.Logger; ++ ++import cpw.mods.fml.server.FMLServerHandler; + import net.minecraft.server.MinecraftServer; + + public class NetLoginHandler extends NetHandler +@@ -132,6 +134,8 @@ + } + + var2.func_20057_k(); ++ ++ FMLServerHandler.instance().handleLogin(p_6007_1_, field_8_b); + } + + this.field_7_c = true; diff --git a/patches/minecraft_server/net/minecraft/src/ServerGUI.java.patch b/patches/minecraft_server/net/minecraft/src/ServerGUI.java.patch new file mode 100644 index 0000000000..24e9d1d6b4 --- /dev/null +++ b/patches/minecraft_server/net/minecraft/src/ServerGUI.java.patch @@ -0,0 +1,21 @@ +--- ../src-base/minecraft_server/net/minecraft/src/ServerGUI.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src-work/minecraft_server/net/minecraft/src/ServerGUI.java 0000-00-00 00:00:00.000000000 -0000 +@@ -3,6 +3,7 @@ + import java.awt.BorderLayout; + import java.awt.Component; + import java.awt.Dimension; ++import java.util.logging.Level; + import java.util.logging.Logger; + import javax.swing.JComponent; + import javax.swing.JFrame; +@@ -78,7 +79,9 @@ + { + JPanel var1 = new JPanel(new BorderLayout()); + JTextArea var2 = new JTextArea(); +- field_22_a.addHandler(new GuiLogOutputHandler(var2)); ++ GuiLogOutputHandler guihandler=new GuiLogOutputHandler(var2); ++ guihandler.setLevel(Level.FINE); ++ field_22_a.addHandler(guihandler); + JScrollPane var3 = new JScrollPane(var2, 22, 30); + var2.setEditable(false); + JTextField var4 = new JTextField(); diff --git a/server/cpw/mods/fml/server/FMLServerHandler.java b/server/cpw/mods/fml/server/FMLServerHandler.java index 8131d59d34..62e718e5ea 100644 --- a/server/cpw/mods/fml/server/FMLServerHandler.java +++ b/server/cpw/mods/fml/server/FMLServerHandler.java @@ -359,6 +359,9 @@ public class FMLServerHandler implements IFMLSidedHandler */ private void handleClientRegistration(Packet250CustomPayload packet, EntityPlayer player) { + if (packet.field_44004_c==null) { + return; + } try { for (String channel : new String(packet.field_44004_c, "UTF8").split("\0"))