diff --git a/Metropolis/pom.xml b/Metropolis/pom.xml index 175df78..47fa4fd 100644 --- a/Metropolis/pom.xml +++ b/Metropolis/pom.xml @@ -37,7 +37,6 @@ - @@ -64,7 +63,7 @@ majinnaibu-repository - ftp://www.majinnaibu.com/majinnaibu/repo + ftp://repo.majinnaibu.com @@ -78,4 +77,4 @@ - \ No newline at end of file + diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeAcquire.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeAcquire.java new file mode 100644 index 0000000..ea84cf4 --- /dev/null +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeAcquire.java @@ -0,0 +1,35 @@ +package com.majinnaibu.bukkitplugins.metropolis.commands; + +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin; + +public class MetropolisHomeAcquire implements CommandExecutor { + MetropolisPlugin _plugin; + + public MetropolisHomeAcquire(MetropolisPlugin plugin){ + _plugin = plugin; + } + + @Override + public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { + if(!(sender instanceof Player)){ + sender.sendMessage("This command can only be used by players"); + return false; + } + + Player player = (Player) sender; + + if(_plugin.getNumPlots(player.getName()) >= _plugin.getMaxPlots(player.getName())){ + sender.sendMessage("You cannot have any more plots"); + return false; + } + + _plugin.assignPlot(player); + return true; + } + +} diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisPlotGoCommand.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisPlotGoCommand.java index 6797416..f689117 100644 --- a/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisPlotGoCommand.java +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisPlotGoCommand.java @@ -3,20 +3,47 @@ package com.majinnaibu.bukkitplugins.metropolis.commands; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin; +import com.majinnaibu.bukkitplugins.metropolis.Plot; public class MetropolisPlotGoCommand implements CommandExecutor { + MetropolisPlugin _plugin; - public MetropolisPlotGoCommand(MetropolisPlugin metropolisPlugin) { - // TODO Auto-generated constructor stub + public MetropolisPlotGoCommand(MetropolisPlugin plugin) { + _plugin = plugin; } @Override - public boolean onCommand(CommandSender arg0, Command arg1, String arg2, - String[] arg3) { - // TODO Auto-generated method stub - return false; + public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { + Player player = null; + Plot plot = null; + + if(sender instanceof Player){ + player = (Player) sender; + } + + if(args.length == 1 && player != null){ + plot = _plugin.getPlot(args[0]); + }else if(args.length >= 2){ + player = _plugin.getPlayer(args[1]); + plot = _plugin.getPlot(args[0]); + }else{ + return false; + } + + if(plot == null || player == null){ + return false; + } + + String errorMessage = _plugin.teleportPlayerToPlot(player, plot); + if(errorMessage != null){ + sender.sendMessage(errorMessage); + return false; + } + + return true; } } diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisPlotReserveCommand.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisPlotReserveCommand.java index 70b6353..964c3a7 100644 --- a/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisPlotReserveCommand.java +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisPlotReserveCommand.java @@ -14,7 +14,6 @@ public class MetropolisPlotReserveCommand implements CommandExecutor { public MetropolisPlotReserveCommand(MetropolisPlugin metropolisPlugin) { _plugin = metropolisPlugin; - } @Override diff --git a/Metropolis/src/main/resources/config.yml b/Metropolis/src/main/resources/config.yml index 3097d2d..e1632a0 100644 --- a/Metropolis/src/main/resources/config.yml +++ b/Metropolis/src/main/resources/config.yml @@ -1,6 +1,6 @@ plot: - sizeX: 24 - sizeZ: 24 + sizeX: 32 sizeY: 256 + sizeZ: 32 ovvsetX: 0 offsetY: 0 offsetZ: 0 defaultMultiplier: 1 maxPerPlayer: 1 initial: 1 floor: generate: true clearSpaceAbove: 66 @@ -9,7 +9,7 @@ plot: generate: true material: 1 sign: - generate: true + generate: true userOverrides: - username: majinnaibu plotMultiplier: 2 maxPlots: 2 - username: hoggrim plotMultiplier: 2 maxPlots: 2 road: width: 4 clearSpaceAbove: 66