From ac1fd3e2e46bccac491fd05ec7cd2fc75c8a2cc1 Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Tue, 3 Sep 2013 15:44:59 -0700 Subject: [PATCH] fix chat plugin listeners. --- .../vault/chat/plugins/Chat_GroupManager.java | 12 +++++------- .../vault/chat/plugins/Chat_PermissionsEx.java | 4 ++-- .../vault/chat/plugins/Chat_bPermissions.java | 4 ++-- .../vault/chat/plugins/Chat_bPermissions2.java | 4 ++-- src/net/milkbowl/vault/chat/plugins/Chat_iChat.java | 4 ++-- src/net/milkbowl/vault/chat/plugins/Chat_mChat.java | 4 ++-- .../milkbowl/vault/chat/plugins/Chat_mChatSuite.java | 4 ++-- .../vault/chat/plugins/Chat_zPermissions.java | 2 +- 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_GroupManager.java b/src/net/milkbowl/vault/chat/plugins/Chat_GroupManager.java index 2585e34..bc2e9cd 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_GroupManager.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_GroupManager.java @@ -12,7 +12,7 @@ You should have received a copy of the GNU Lesser General Public License along with Vault. If not, see . -*/ + */ package net.milkbowl.vault.chat.plugins; import java.util.logging.Logger; @@ -68,13 +68,11 @@ public class Chat_GroupManager extends Chat { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (chat.groupManager == null) { - Plugin perms = plugin.getServer().getPluginManager().getPlugin("GroupManager"); + Plugin perms = event.getPlugin(); - if (perms != null) { - if (perms.isEnabled()) { - chat.groupManager = (GroupManager) perms; - log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), chat.name)); - } + if (perms.getDescription().getName().equals("GroupManager")) { + chat.groupManager = (GroupManager) perms; + log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), chat.name)); } } } diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_PermissionsEx.java b/src/net/milkbowl/vault/chat/plugins/Chat_PermissionsEx.java index d0e0bfd..94dc46c 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_PermissionsEx.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_PermissionsEx.java @@ -67,9 +67,9 @@ public class Chat_PermissionsEx extends Chat { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (chat.chat == null) { - Plugin perms = plugin.getServer().getPluginManager().getPlugin("PermissionsEx"); + Plugin perms = event.getPlugin(); - if (perms != null) { + if (perms.getDescription().getName().equals("PermissionsEx")) { if (perms.isEnabled()) { chat.chat = (PermissionsEx) perms; log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), chat.name)); diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_bPermissions.java b/src/net/milkbowl/vault/chat/plugins/Chat_bPermissions.java index 5d51523..839dcb4 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_bPermissions.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_bPermissions.java @@ -63,8 +63,8 @@ public class Chat_bPermissions extends Chat { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (this.chat.chat == null) { - Plugin chat = plugin.getServer().getPluginManager().getPlugin("bPermissions"); - if (chat != null) { + Plugin chat = event.getPlugin(); + if (chat.getDescription().getName().equals("bPermissions")) { this.chat.chat = Permissions.getInfoReader(); log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), "bPermissions")); } diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_bPermissions2.java b/src/net/milkbowl/vault/chat/plugins/Chat_bPermissions2.java index 81b3e57..4a4a432 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_bPermissions2.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_bPermissions2.java @@ -63,8 +63,8 @@ public class Chat_bPermissions2 extends Chat { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (!hooked) { - Plugin chat = plugin.getServer().getPluginManager().getPlugin("bPermissions"); - if (chat != null) { + Plugin chat = event.getPlugin(); + if (chat.getDescription().getName().equals("bPermissions")) { hooked = true; log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), "bPermissions2")); } diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_iChat.java b/src/net/milkbowl/vault/chat/plugins/Chat_iChat.java index c5242a0..15d4e44 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_iChat.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_iChat.java @@ -64,8 +64,8 @@ public class Chat_iChat extends Chat { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (this.chat.iChat == null) { - Plugin chat = plugin.getServer().getPluginManager().getPlugin("iChat"); - if (chat != null) { + Plugin chat = event.getPlugin(); + if (chat.getDescription().getName().equals("iChat")) { this.chat.iChat = ((iChat) chat).API; log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), "iChat")); } diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_mChat.java b/src/net/milkbowl/vault/chat/plugins/Chat_mChat.java index 995ddb6..87d975c 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_mChat.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_mChat.java @@ -62,8 +62,8 @@ public class Chat_mChat extends Chat { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (this.chat.mChat == null) { - Plugin chat = plugin.getServer().getPluginManager().getPlugin("mChat"); - if (chat != null) { + Plugin chat = event.getPlugin(); + if (chat.getDescription().getName().equals("mChat")) { this.chat.mChat = net.D3GN.MiracleM4n.mChat.mChat.API; log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), "mChat")); } diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_mChatSuite.java b/src/net/milkbowl/vault/chat/plugins/Chat_mChatSuite.java index aba4321..ea64adf 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_mChatSuite.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_mChatSuite.java @@ -60,8 +60,8 @@ public class Chat_mChatSuite extends Chat { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (mChat == null) { - Plugin chat = plugin.getServer().getPluginManager().getPlugin("mChatSuite"); - if (chat != null) { + Plugin chat = event.getPlugin(); + if (chat.getDescription().getName().equals("mChatSuite")) { mChat = (mChatSuite) chat; log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), "mChatSuite")); } diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_zPermissions.java b/src/net/milkbowl/vault/chat/plugins/Chat_zPermissions.java index c0d1624..ed195f8 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_zPermissions.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_zPermissions.java @@ -55,7 +55,7 @@ public class Chat_zPermissions extends Chat { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { - if (service == null) { + if (service == null && event.getPlugin().getDescription().getName().equals("zPermissions")) { service = plugin.getServer().getServicesManager().load(ZPermissionsService.class); if (service != null) log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), name));