From 3f29f788d5a8482aad92ba6007dfa31a59613f3b Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Tue, 2 Jul 2013 12:50:59 -0700 Subject: [PATCH 1/3] Bye bye /butcher! --- .../Listener/TFM_PlayerListener.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index ce222ee4..5fb66293 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -530,6 +530,21 @@ public class TFM_PlayerListener implements Listener block_command = true; } } + else if (Pattern.compile("^/butcher").matcher(command).find()) + { + if (!TFM_SuperadminList.isUserSuperadmin(p)) + { + block_command = true; + } + } + //Just incase, a // version + else if (Pattern.compile("^//butcher").matcher(command).find()) + { + if (!TFM_SuperadminList.isUserSuperadmin(p)) + { + block_command = true; + } + } if (block_command) { From 797de66e1035a70e58bda725b8d82347272142f0 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Tue, 2 Jul 2013 19:36:59 -0700 Subject: [PATCH 2/3] removed --- .../TotalFreedomMod/Listener/TFM_PlayerListener.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 5fb66293..aed87554 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -530,14 +530,6 @@ public class TFM_PlayerListener implements Listener block_command = true; } } - else if (Pattern.compile("^/butcher").matcher(command).find()) - { - if (!TFM_SuperadminList.isUserSuperadmin(p)) - { - block_command = true; - } - } - //Just incase, a // version else if (Pattern.compile("^//butcher").matcher(command).find()) { if (!TFM_SuperadminList.isUserSuperadmin(p)) From a0cf0e93527e96f7555ee5731e48f361c1094520 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Tue, 2 Jul 2013 19:40:18 -0700 Subject: [PATCH 3/3] oops --- .../TotalFreedomMod/Listener/TFM_PlayerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index aed87554..30978182 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -530,7 +530,7 @@ public class TFM_PlayerListener implements Listener block_command = true; } } - else if (Pattern.compile("^//butcher").matcher(command).find()) + else if (Pattern.compile("^//?butcher").matcher(command).find()) { if (!TFM_SuperadminList.isUserSuperadmin(p)) {