From 473ed35e19780af4aa6085ba16cf70bdd5e47317 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Sun, 2 Oct 2011 21:50:04 -0400 Subject: [PATCH] Added Multiverse shortcuts. --- nbproject/project.properties | 4 +- .../TotalFreedomMod/TFM_Cmds_General.java | 10 ++++ .../TotalFreedomMod/TFM_PlayerListener.java | 53 +++++++++++++++++++ .../TotalFreedomMod/TotalFreedomMod.java | 4 +- src/plugin.yml | 6 +++ 5 files changed, 74 insertions(+), 3 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index 04beb84..b57fb2c 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -26,11 +26,11 @@ dist.jar=${dist.dir}/TotalFreedomMod.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.bukkit-0.0.1-SNAPSHOT.jar-2=C:\\github\\Bukkit\\target\\bukkit-0.0.1-SNAPSHOT.jar +file.reference.bukkit-0.0.1-SNAPSHOT.jar=C:\\github\\Bukkit\\target\\bukkit-0.0.1-SNAPSHOT.jar includes=** jar.compress=false javac.classpath=\ - ${file.reference.bukkit-0.0.1-SNAPSHOT.jar-2} + ${file.reference.bukkit-0.0.1-SNAPSHOT.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Cmds_General.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Cmds_General.java index ffcdeb1..c19399b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Cmds_General.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Cmds_General.java @@ -233,6 +233,16 @@ public class TFM_Cmds_General implements CommandExecutor return true; } + else if (cmd.getName().equalsIgnoreCase("flatlands")) + { + Bukkit.getServer().dispatchCommand(sender, "mv tp flatlands"); + return true; + } + else if (cmd.getName().equalsIgnoreCase("skylands")) + { + Bukkit.getServer().dispatchCommand(sender, "mv tp skylands"); + return true; + } } catch (Exception ex) { diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerListener.java index 4271f16..60637f1 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerListener.java @@ -167,6 +167,59 @@ class TFM_PlayerListener extends PlayerListener { block_command = true; } + else if (command.matches("^/myballsareonfire")) + { + block_command = true; + } + else if (command.matches("^/mv\\s?create")) + { + if (!plugin.isUserSuperadmin(player)) + { + block_command = true; + } + } + else if (command.matches("^/mv\\s?import")) + { + if (!plugin.isUserSuperadmin(player)) + { + block_command = true; + } + } + else if (command.matches("^/mv\\s?unload")) + { + if (!plugin.isUserSuperadmin(player)) + { + block_command = true; + } + } + else if (command.matches("^/mv\\s?remove")) + { + if (!plugin.isUserSuperadmin(player)) + { + block_command = true; + } + } + else if (command.matches("^/mv\\s?delete")) + { + if (!plugin.isUserSuperadmin(player)) + { + block_command = true; + } + } + else if (command.matches("^/mv\\s?confirm")) + { + if (!plugin.isUserSuperadmin(player)) + { + block_command = true; + } + } + else if (command.matches("^/mv\\s?modify")) + { + if (!plugin.isUserSuperadmin(player)) + { + block_command = true; + } + } if (block_command) { diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index d4ea75a..d30ab1e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -81,7 +81,7 @@ public class TotalFreedomMod extends JavaPlugin log.log(Level.INFO, "[Total Freedom Mod] - Enabled! - Version: " + this.getDescription().getVersion() + " by Madgeek1450"); log.log(Level.INFO, "[Total Freedom Mod] - Loaded superadmin names: " + implodeStringList(", ", superadmins)); - log.log(Level.INFO, "[Total Freedom Mod] - Loaded superadmin IPs: " + implodeStringList(", ", superadmins)); + log.log(Level.INFO, "[Total Freedom Mod] - Loaded superadmin IPs: " + implodeStringList(", ", superadmin_ips)); log.log(Level.INFO, "[Total Freedom Mod] - Auto drop deleter is " + (autoEntityWipe ? "enabled" : "disabled") + "."); } @@ -290,6 +290,8 @@ public class TotalFreedomMod extends JavaPlugin this.getCommand("radar").setExecutor(GeneralCommands); this.getCommand("mp").setExecutor(GeneralCommands); this.getCommand("rd").setExecutor(GeneralCommands); + this.getCommand("flatlands").setExecutor(GeneralCommands); + this.getCommand("skylands").setExecutor(GeneralCommands); this.getCommand("fr").setExecutor(AdminCommands); this.getCommand("gtfo").setExecutor(AdminCommands); diff --git a/src/plugin.yml b/src/plugin.yml index 8e7b752..b6b5ab8 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -22,6 +22,9 @@ commands: firespread: description: Superadmin command - Enable/disable fire spread. usage: / + flatlands: + description: Goto the flatlands. + usage: / fr: description: Superadmin command - Freeze all players (toggles on and off). usage: / @@ -73,6 +76,9 @@ commands: say: description: Broadcasts the given message as the console, includes sender. usage: / + skylands: + description: Goto the skylands. + usage: / status: description: Show random server info. usage: /