From 472cc55b432a1ffef398aaaf5ce23cdc82586be5 Mon Sep 17 00:00:00 2001 From: psgs Date: Tue, 18 Feb 2014 19:40:18 +1000 Subject: [PATCH 1/2] Add support for config based wildcards --- .../CommandBouncer/player/CommandListener.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/carlgo11/CommandBouncer/player/CommandListener.java b/src/main/java/com/carlgo11/CommandBouncer/player/CommandListener.java index ccb8f0d..a5d6aee 100644 --- a/src/main/java/com/carlgo11/CommandBouncer/player/CommandListener.java +++ b/src/main/java/com/carlgo11/CommandBouncer/player/CommandListener.java @@ -25,8 +25,15 @@ public void onPlayerCommand(PlayerCommandPreprocessEvent e) { String cmd = e.getMessage(); for (int a = 1; a != CommandBouncer.a; a++) { + plugin.senddebug("forloop started!"); - if (e.getMessage().equalsIgnoreCase("/" + plugin.getConfig().getString("cmd" + a))) { + String[] splitCommand = e.getMessage().split(" "); + // Iterate through the split command + if (plugin.getConfig().contains(splitCommand[0] + " *")) { + e.setMessage(splitCommand[0]); + } + + if (e.getMessage().equalsIgnoreCase("/" + plugin.getConfig().getString("cmd" + a)) || (plugin.getConfig().getString("cmd" + a).equalsIgnoreCase(e.getMessage() + " *"))) { plugin.senddebug("matches cmd" + a); if (!Checks.checkDisPlayer(plugin, player)) { if (!Checks.checkDisWorld(plugin, player.getWorld())) { @@ -69,11 +76,11 @@ public void onPlayerCommand(PlayerCommandPreprocessEvent e) { } else { plugin.senddebug(player.getWorld().getName() + " is a disabled world."); } - + } else { plugin.senddebug(player.getName() + " is an ignored player."); } - + } else { if (plugin.getConfig().getBoolean("debug")) { System.out.println("[" + plugin.getDescription().getName() + "] " + "No match: cmd" + a); @@ -84,4 +91,4 @@ public void onPlayerCommand(PlayerCommandPreprocessEvent e) { } } -} +} \ No newline at end of file From 69ea78d87c8ab5f02fa1850e6a86557474d21a9f Mon Sep 17 00:00:00 2001 From: psgs Date: Tue, 18 Feb 2014 19:44:23 +1000 Subject: [PATCH 2/2] Remove rogue comment and fix bracket formatting --- .../com/carlgo11/CommandBouncer/player/CommandListener.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/carlgo11/CommandBouncer/player/CommandListener.java b/src/main/java/com/carlgo11/CommandBouncer/player/CommandListener.java index a5d6aee..fe0cabb 100644 --- a/src/main/java/com/carlgo11/CommandBouncer/player/CommandListener.java +++ b/src/main/java/com/carlgo11/CommandBouncer/player/CommandListener.java @@ -28,10 +28,9 @@ public void onPlayerCommand(PlayerCommandPreprocessEvent e) { plugin.senddebug("forloop started!"); String[] splitCommand = e.getMessage().split(" "); - // Iterate through the split command if (plugin.getConfig().contains(splitCommand[0] + " *")) { e.setMessage(splitCommand[0]); - } + } if (e.getMessage().equalsIgnoreCase("/" + plugin.getConfig().getString("cmd" + a)) || (plugin.getConfig().getString("cmd" + a).equalsIgnoreCase(e.getMessage() + " *"))) { plugin.senddebug("matches cmd" + a);