From ebef0c3b03ab50faaf77d70a02ac4f0c24d7b63f Mon Sep 17 00:00:00 2001 From: Jos van 't Hof Date: Sat, 7 Apr 2012 10:13:48 +0200 Subject: [PATCH] Matched commands to new world configuration. --- ...domSpawnDisableCommand.java => DisableCommand.java} | 8 ++++---- ...andomSpawnEnableCommand.java => EnableCommand.java} | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) rename plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/{RandomSpawnDisableCommand.java => DisableCommand.java} (67%) rename plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/{RandomSpawnEnableCommand.java => EnableCommand.java} (72%) diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnDisableCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/DisableCommand.java similarity index 67% rename from plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnDisableCommand.java rename to plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/DisableCommand.java index 39ade68cc..472a327dd 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnDisableCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/DisableCommand.java @@ -7,16 +7,16 @@ import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class RandomSpawnDisableCommand extends RandomSpawnCommandExecutor{ +public class DisableCommand extends RandomSpawnCommandExecutor{ - public RandomSpawnDisableCommand(){ - this.name = "disable"; + public DisableCommand(){ + name = "disable"; } public boolean onCommand(CommandSender sender, List args){ Player player = (Player) sender; String worldname = player.getWorld().getName(); - plugin.yamlHandler.worlds.set(worldname + ".randomspawnenabled", false); + plugin.yamlHandler.worlds.set(worldname + ".randomspawnon", null); plugin.yamlHandler.saveWorlds(); plugin.playerInfo(player, "Random Spawn is now disabled in this world!"); return true; diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnEnableCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/EnableCommand.java similarity index 72% rename from plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnEnableCommand.java rename to plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/EnableCommand.java index b98f78357..5126039b1 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnEnableCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/EnableCommand.java @@ -7,16 +7,19 @@ import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class RandomSpawnEnableCommand extends RandomSpawnCommandExecutor{ +public class EnableCommand extends RandomSpawnCommandExecutor{ - public RandomSpawnEnableCommand(){ + public EnableCommand(){ this.name = "enable"; } public boolean onCommand(CommandSender sender, List args){ Player player = (Player) sender; String worldname = player.getWorld().getName(); - plugin.yamlHandler.worlds.set(worldname + ".randomspawnenabled", true); + List spawnFlags = plugin.yamlHandler.worlds.getStringList(worldname + ".randomspawnon"); + spawnFlags.add("respawn"); + + plugin.yamlHandler.worlds.set(worldname + ".randomspawnon", spawnFlags); if (!(plugin.yamlHandler.worlds.contains(worldname +".spawnarea"))){ plugin.yamlHandler.worlds.set(worldname + ".spawnarea.x-min", -100); @@ -27,6 +30,7 @@ public class RandomSpawnEnableCommand extends RandomSpawnCommandExecutor{ plugin.yamlHandler.saveWorlds(); plugin.playerInfo(player, "Random Spawn is now enabled in this world!"); + return true; } }