fix integrated server plugin channels being continuously re-registered in single player

Mumfrey
1 parent 97328206
Showing 4 changed files with 14 additions and 6 deletions
java/common/com/mumfrey/liteloader/core/ClientPluginChannels.java
java/common/com/mumfrey/liteloader/core/Events.java
java/common/com/mumfrey/liteloader/core/PluginChannels.java
java/common/com/mumfrey/liteloader/core/ServerPluginChannels.java
@@ -131,6 +131,12 @@ public abstract class ClientPluginChannels extends PluginChannels&lt;PluginChannelL
 		try
 		{
+			// Enumerate mods for plugin channels
+			for (PluginChannelListener pluginChannelListener : this.pluginChannelListeners)
+			{
+				this.addPluginChannelsFor(pluginChannelListener);
+			}
+
 			byte[] registrationData = this.getRegistrationData();
 			if (registrationData != null)
 			{
@@ -219,6 +219,8 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement
 			for (ServerCommandProvider commandProvider : this.serverCommandProviders)
 				commandProvider.provideCommands(serverCommandManager);
 		}
+
+		LiteLoader.getServerPluginChannels().onServerStartup();
 	}
 	/**
@@ -133,12 +133,6 @@ public abstract class PluginChannels&lt;L extends CommonPluginChannelListener&gt; impl
 	 */
 	protected byte[] getRegistrationData()
 	{
-		// Enumerate mods for plugin channels
-		for (L pluginChannelListener : this.pluginChannelListeners)
-		{
-			this.addPluginChannelsFor(pluginChannelListener);
-		}
-		
 		// If any mods have registered channels, send the REGISTER packet
 		if (this.pluginChannels.keySet().size() > 0)
 		{
@@ -71,6 +71,12 @@ public class ServerPluginChannels extends PluginChannels&lt;ServerPluginChannelList
 	void onServerStartup()
 	{
 		this.clearPluginChannels(null);
+		
+		// Enumerate mods for plugin channels
+		for (ServerPluginChannelListener pluginChannelListener : this.pluginChannelListeners)
+		{
+			this.addPluginChannelsFor(pluginChannelListener);
+		}
 	}
 	/**