From fcc781b10069331077642800d5cbe32e5f5fdfa3 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 7 Feb 2012 05:13:19 -0800 Subject: [PATCH] Fixed return value for un/registerChannel. Now returns properly indicate when un/register commands should be sent. --- .../net/minecraft/src/forge/MessageManager.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/MessageManager.java b/forge/forge_common/net/minecraft/src/forge/MessageManager.java index 9ae039b472..0c3cd71f3b 100644 --- a/forge/forge_common/net/minecraft/src/forge/MessageManager.java +++ b/forge/forge_common/net/minecraft/src/forge/MessageManager.java @@ -69,9 +69,11 @@ public class MessageManager { ArrayList handlers = channelToHandlers.get(channel); ArrayList channels = handlerToChannels.get(handler); + boolean ret = false; if (handlers == null) { + ret = true; handlers = new ArrayList(); channelToHandlers.put(channel, handlers); } @@ -82,16 +84,13 @@ public class MessageManager handlerToChannels.put(handler, channels); } - boolean ret = false; if (!channels.contains(channel)) { channels.add(channel); - ret = true; } if (!handlers.contains(handler)) { handlers.add(handler); - ret = true; } return ret; } @@ -113,17 +112,16 @@ public class MessageManager if (handlers != null && handlers.contains(handler)) { - ret = true; handlers.remove(handler); if (handlers.size() == 0) { + ret = true; channelToHandlers.remove(channel); } } if (channels != null && channels.contains(channel)) { - ret = true; channels.remove(channel); if (handlers.size() == 0) {