Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts: Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
This commit is contained in:
commit
ccb6456110
@ -67,7 +67,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
|
||||
MessageHandler messageHandler = new MessageHandler(this);
|
||||
|
||||
ServerCommandManager.getInstance().registerCommandType("AnnouncementCommand", AnnouncementCommand.class,
|
||||
new AnnouncementHandler(_clientManager));
|
||||
new AnnouncementHandler(clientManager));
|
||||
|
||||
ServerCommandManager.getInstance().registerCommandType("RedisMessage", RedisMessage.class, messageHandler);
|
||||
ServerCommandManager.getInstance()
|
||||
|
Loading…
Reference in New Issue
Block a user