diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java index ba41a8fc4..47b1948b5 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java @@ -66,9 +66,9 @@ public class MessageManager extends MiniClientPlugin ServerCommandManager.getInstance().registerCommandType("AnnouncementCommand", AnnouncementCommand.class, new AnnouncementHandler()); - ServerCommandManager.getInstance().registerCommandType("RedisMessage", RedisMessage.class, messageHandler); - ServerCommandManager.getInstance() - .registerCommandType("RedisMessageCallback", RedisMessageCallback.class, messageHandler); + //ServerCommandManager.getInstance().registerCommandType("RedisMessage", RedisMessage.class, messageHandler); + //ServerCommandManager.getInstance() + // .registerCommandType("RedisMessageCallback", RedisMessageCallback.class, messageHandler); } public void addCommands() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java index 89afcd12b..5c334f60d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java @@ -40,8 +40,8 @@ public class PartyManager extends MiniPlugin _preferenceManager = preferenceManager; _serverName = getPlugin().getConfig().getString("serverstatus.name"); - ServerCommandManager.getInstance().registerCommandType("RedisPartyData", RedisPartyData.class, - new RedisPartyHandler(this)); + //ServerCommandManager.getInstance().registerCommandType("RedisPartyData", RedisPartyData.class, + // new RedisPartyHandler(this)); } @Override diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java index 182628344..a26b07d11 100644 --- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java +++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java @@ -112,22 +112,15 @@ public class ServerCommandManager { Class commandClazz = _commandTypes.get(commandType).getCommandType(); final ServerCommand serverCommand = Utility.deserialize(serializedCommand, commandClazz); - - new Thread("Redis Command " + commandType) + + // TODO: Run synchronously? + CommandCallback callback = _commandTypes.get(commandType).getCallback(); + serverCommand.run(); // Run server command without callback + + if (callback != null) { - public void run() - { - // TODO: Run synchronously? - CommandCallback callback = _commandTypes.get(commandType).getCallback(); - serverCommand.run(); // Run server command without callback - - if (callback != null) - { - callback.run(serverCommand); // Run callback - } - } - - }.start(); + callback.run(serverCommand); // Run callback + } } }