EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-10-29 16:43:43 +01:00
Code Issues Projects Releases Wiki Activity

Forgot to merge... Bleh...

Browse Source
This commit is contained in:
Sauilitired
2014-09-29 19:11:21 +02:00
parent 1e6ae5c467
commit c60bd3bbc8
3 changed files with 651 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

795
.idea/workspace.xml generated
View File

File diff suppressed because it is too large Load Diff

58
PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java
View File

@@ -1,37 +1,32 @@
/* /*
* Copyright (c) IntellectualCrafters - 2014. * Copyright (c) IntellectualCrafters - 2014.
* You are not allowed to distribute and/or monetize any of our intellectual property. * You are not allowed to distribute and/or monetize any of our intellectual property.
* IntellectualCrafters is not affiliated with Mojang AB. Minecraft is a trademark of Mojang AB. * IntellectualCrafters is not affiliated with Mojang AB. Minecraft is a trademark of Mojang AB.
* *
* >> File = Auto.java * >> File = Auto.java
* >> Generated by: Citymonstret at 2014-08-09 01:40 * >> Generated by: Citymonstret at 2014-08-09 01:40
*/ */
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.intellectualcrafters.plot.C; import com.intellectualcrafters.plot.C;
import com.intellectualcrafters.plot.PlayerFunctions; import com.intellectualcrafters.plot.PlayerFunctions;
import com.intellectualcrafters.plot.Plot; import com.intellectualcrafters.plot.Plot;
import com.intellectualcrafters.plot.PlotHelper; import com.intellectualcrafters.plot.PlotHelper;
import com.intellectualcrafters.plot.PlotId; import com.intellectualcrafters.plot.PlotId;
import com.intellectualcrafters.plot.PlotMain; import com.intellectualcrafters.plot.PlotMain;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public class Auto extends SubCommand { public class Auto extends SubCommand {
public Auto() { public Auto() {
super("auto", "plots.auto", "Claim the nearest plot", "auto", "a", CommandCategory.CLAIMING); super("auto", "plots.auto", "Claim the nearest plot", "auto", "a", CommandCategory.CLAIMING);
} }
// TODO auto claim a mega plot!!!!!!!!!!!! // TODO auto claim a mega plot!!!!!!!!!!!!
@Override @Override
public boolean execute(Player plr, String... args) { public boolean execute(Player plr, String... args) {
World world; World world;
int size_x = 1;
int size_z = 1;
if (PlotMain.getPlotWorlds().length == 1) { if (PlotMain.getPlotWorlds().length == 1) {
world = Bukkit.getWorld(PlotMain.getPlotWorlds()[0]); world = Bukkit.getWorld(PlotMain.getPlotWorlds()[0]);
} else { } else {
@@ -41,7 +36,6 @@ public class Auto extends SubCommand {
PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT_WORLD); PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
return false; return false;
} }
} }
if (args.length == 1) { if (args.length == 1) {
if (PlotMain.hasPermission(plr, "plots.auto.mega")) { if (PlotMain.hasPermission(plr, "plots.auto.mega")) {
@@ -91,38 +85,6 @@ public class Auto extends SubCommand {
x = q; x = q;
z = q; z = q;
} }
while (!br) {
id = new PlotId(x, z);
if (PlotHelper.getPlot(world, id).owner == null) {
Plot plot = PlotHelper.getPlot(world, id);
PlotWorld plotworld = PlotMain.getWorldSettings(plot.getWorld());
if(PlotMain.useEconomy && plotworld.USE_ECONOMY) {
double cost = plotworld.PLOT_PRICE;
if(cost > 0d) {
Economy economy = PlotMain.economy;
if(economy.getBalance(plr) < cost) {
sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + cost);
return true;
}
economy.withdrawPlayer(plr, cost);
sendMessage(plr, C.REMOVED_BALANCE, cost + "");
}
}
String schematic;
if(args.length > 0 && !(schematic = args[0]).equals("")) {
if(plotworld.SCHEMATIC_CLAIM_SPECIFY) {
if(!plotworld.SCHEMATICS.contains(schematic.toLowerCase())) {
sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent");
return true;
}
if(!plr.hasPermission("plots.claim." + schematic) && !plr.hasPermission("plots.admin")) {
PlayerFunctions.sendMessage(plr, C.NO_SCHEMATIC_PERMISSION, schematic);
return true;
}
}
}
boolean result = Claim.claimPlot(plr, plot, true);
br = !result;
} }
} }
else { else {
@@ -130,9 +92,7 @@ public class Auto extends SubCommand {
PlotId start = new PlotId(x, z); PlotId start = new PlotId(x, z);
PlotId end = new PlotId(x+size_x-1, z+size_z-1); PlotId end = new PlotId(x+size_x-1, z+size_z-1);
if (isUnowned(world, start, end)) { if (isUnowned(world, start, end)) {
// TODO claim event // TODO claim event
for (int i = start.x; i <= end.x; i++) { for (int i = start.x; i <= end.x; i++) {
for (int j = start.y; j <= end.y; j++) { for (int j = start.y; j <= end.y; j++) {
Plot plot = PlotHelper.getPlot(world, new PlotId(i,j)); Plot plot = PlotHelper.getPlot(world, new PlotId(i,j));

176
PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java
View File

@@ -40,29 +40,33 @@ import com.intellectualcrafters.plot.events.PlotFlagRemoveEvent;
* @author Citymonstret * @author Citymonstret
* *
*/ */
public class Set extends SubCommand { public class Set extends SubCommand{
public Set() { public Set() {
super(Command.SET, "Set a plot value", "set {arg} {value...}", CommandCategory.ACTIONS); super(Command.SET, "Set a plot value", "set {arg} {value...}", CommandCategory.ACTIONS);
} }
public static String[] values = new String[] { "biome", "wall", "wall_filling", "floor", "alias", "home", "rain", "flag" }; public static String[] values = new String[] {
public static String[] aliases = new String[] { "b", "w", "wf", "f", "a", "h", "r", "fl" }; "biome", "wall", "wall_filling", "floor", "alias", "home", "rain", "flag"
};
public static String[] aliases = new String[] {
"b", "w", "wf", "f", "a", "h", "r", "fl"
};
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override @Override
public boolean execute(Player plr, String... args) { public boolean execute(Player plr, String ... args) {
if (!PlayerFunctions.isInPlot(plr)) { if(!PlayerFunctions.isInPlot(plr)) {
PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT); PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT);
return false; return false;
} }
Plot plot = PlayerFunctions.getCurrentPlot(plr); Plot plot = PlayerFunctions.getCurrentPlot(plr);
if (!plot.hasRights(plr) && !plr.hasPermission("plots.admin")) { if(!plot.hasRights(plr) && !plr.hasPermission("plots.admin")) {
PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS); PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
return false; return false;
} }
if (args.length < 1) { if(args.length < 1) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append(C.SUBCOMMAND_SET_OPTIONS_HEADER.s()); builder.append(C.SUBCOMMAND_SET_OPTIONS_HEADER.s());
builder.append(getArgumentList(values)); builder.append(getArgumentList(values));
@@ -70,8 +74,8 @@ public class Set extends SubCommand {
return true; return true;
} }
for (int i = 0; i < aliases.length; i++) { for(int i = 0; i < aliases.length; i++) {
if (aliases[i].equalsIgnoreCase(args[0])) { if(aliases[i].equalsIgnoreCase(args[0])) {
args[0] = values[i]; args[0] = values[i];
break; break;
} }
@@ -79,19 +83,19 @@ public class Set extends SubCommand {
/* TODO: Implement option */ /* TODO: Implement option */
boolean advanced_permissions = false; boolean advanced_permissions = false;
if (advanced_permissions) { if(advanced_permissions) {
if (!plr.hasPermission("plots.set." + args[0].toLowerCase())) { if(!plr.hasPermission("plots.set." + args[0].toLowerCase())) {
PlayerFunctions.sendMessage(plr, C.NO_PERMISSION); PlayerFunctions.sendMessage(plr, C.NO_PERMISSION);
return false; return false;
} }
} }
if (args[0].equalsIgnoreCase("flag")) { if(args[0].equalsIgnoreCase("flag")) {
if (args.length < 2) { if(args.length < 2) {
PlayerFunctions.sendMessage(plr, C.NEED_KEY.s().replaceAll("%values%", StringUtils.join(FlagManager.getFlags(), "&c, &6"))); PlayerFunctions.sendMessage(plr, C.NEED_KEY.s().replaceAll("%values%", StringUtils.join(PlotMain.getFlags(),"&c, &6")));
return false; return false;
} }
if (FlagManager.getFlag(args[1])==null) { if (!PlotMain.isRegisteredFlag(args[1])) {
PlayerFunctions.sendMessage(plr, C.NOT_VALID_FLAG); PlayerFunctions.sendMessage(plr, C.NOT_VALID_FLAG);
return false; return false;
} }
@@ -99,35 +103,34 @@ public class Set extends SubCommand {
PlayerFunctions.sendMessage(plr, C.NO_PERMISSION); PlayerFunctions.sendMessage(plr, C.NO_PERMISSION);
return false; return false;
} }
if (args.length == 2) { if (args.length==2) {
if (plot.settings.getFlag(args[1].toLowerCase()) == null) { if (plot.settings.getFlag(args[1].toLowerCase())==null) {
PlayerFunctions.sendMessage(plr, C.FLAG_NOT_IN_PLOT); PlayerFunctions.sendMessage(plr, C.FLAG_NOT_IN_PLOT);
return false; return false;
} }
Flag flag = plot.settings.getFlag(args[1].toLowerCase()); Flag flag = plot.settings.getFlag(args[1].toLowerCase());
PlotFlagRemoveEvent event = new PlotFlagRemoveEvent(flag, plot); PlotFlagRemoveEvent event = new PlotFlagRemoveEvent(flag,plot);
Bukkit.getServer().getPluginManager().callEvent(event); Bukkit.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) { if(event.isCancelled()) {
PlayerFunctions.sendMessage(plr, C.FLAG_NOT_REMOVED); PlayerFunctions.sendMessage(plr, C.FLAG_NOT_REMOVED);
event.setCancelled(true); event.setCancelled(true);
return false; return false;
} }
java.util.Set<Flag> newflags = plot.settings.getFlags(); java.util.Set<Flag> newflags = plot.settings.getFlags();
Flag oldFlag = plot.settings.getFlag(args[1].toLowerCase()); Flag oldFlag = plot.settings.getFlag(args[1].toLowerCase());
if (oldFlag != null) { if (oldFlag!=null)
newflags.remove(oldFlag); newflags.remove(oldFlag);
}
plot.settings.setFlags(newflags.toArray(new Flag[0])); plot.settings.setFlags(newflags.toArray(new Flag[0]));
DBFunc.setFlags(plr.getWorld().getName(), plot, newflags.toArray(new Flag[0])); DBFunc.setFlags(plr.getWorld().getName(), plot, newflags.toArray(new Flag[0]));
PlayerFunctions.sendMessage(plr, C.FLAG_REMOVED); PlayerFunctions.sendMessage(plr, C.FLAG_REMOVED);
return true; return true;
} }
try { try {
String value = StringUtils.join(Arrays.copyOfRange(args, 2, args.length), " "); String value = StringUtils.join(Arrays.copyOfRange(args, 2, args.length)," ");
Flag flag = new Flag(new AbstractFlag(args[1]), value); Flag flag = new Flag(args[1], value);
PlotFlagAddEvent event = new PlotFlagAddEvent(flag, plot); PlotFlagAddEvent event = new PlotFlagAddEvent(flag,plot);
Bukkit.getServer().getPluginManager().callEvent(event); Bukkit.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) { if(event.isCancelled()) {
PlayerFunctions.sendMessage(plr, C.FLAG_NOT_ADDED); PlayerFunctions.sendMessage(plr, C.FLAG_NOT_ADDED);
event.setCancelled(true); event.setCancelled(true);
return false; return false;
@@ -136,48 +139,44 @@ public class Set extends SubCommand {
DBFunc.setFlags(plr.getWorld().getName(), plot, plot.settings.getFlags().toArray(new Flag[0])); DBFunc.setFlags(plr.getWorld().getName(), plot, plot.settings.getFlags().toArray(new Flag[0]));
PlayerFunctions.sendMessage(plr, C.FLAG_ADDED); PlayerFunctions.sendMessage(plr, C.FLAG_ADDED);
return true; return true;
} catch (Exception e) { }
PlayerFunctions.sendMessage(plr, "&c" + e.getMessage()); catch (Exception e) {
PlayerFunctions.sendMessage(plr, "&c"+e.getMessage());
return false; return false;
} }
} }
if (args[0].equalsIgnoreCase("rain")) { if(args[0].equalsIgnoreCase("rain")) {
if (args.length < 2) { if(args.length < 2) {
PlayerFunctions.sendMessage(plr, C.NEED_ON_OFF); PlayerFunctions.sendMessage(plr, C.NEED_ON_OFF);
return false; return false;
} }
String word = args[1]; String word = args[1];
if (!word.equalsIgnoreCase("on") && !word.equalsIgnoreCase("off")) { if(!word.equalsIgnoreCase("on") && !word.equalsIgnoreCase("off")) {
PlayerFunctions.sendMessage(plr, C.NEED_ON_OFF); PlayerFunctions.sendMessage(plr, C.NEED_ON_OFF);
return true; return true;
} }
boolean b = word.equalsIgnoreCase("on"); boolean b = word.equalsIgnoreCase("on");
DBFunc.setWeather(plr.getWorld().getName(), plot, b); DBFunc.setWeather(plr.getWorld().getName(), plot, b);
PlayerFunctions.sendMessage(plr, C.SETTING_UPDATED); PlayerFunctions.sendMessage(plr, C.SETTING_UPDATED);
for (Player p : Bukkit.getOnlinePlayers()) { for(Player p : Bukkit.getOnlinePlayers()) {
if (PlayerFunctions.getCurrentPlot(plr).id == plot.id) { if(PlayerFunctions.getCurrentPlot(plr).id == plot.id) {
if (b) { if(b) p.setPlayerWeather(WeatherType.DOWNFALL);
p.setPlayerWeather(WeatherType.DOWNFALL); else p.resetPlayerWeather();
} else {
p.resetPlayerWeather();
}
} }
} }
return true; return true;
} }
if (args[0].equalsIgnoreCase("home")) { if(args[0].equalsIgnoreCase("home")) {
if (args.length < 2) { if(args.length < 2) {
PlayerFunctions.sendMessage(plr, C.MISSING_POSITION); PlayerFunctions.sendMessage(plr, C.MISSING_POSITION);
return false; return false;
} }
PlotHomePosition position = null; PlotHomePosition position = null;
for (PlotHomePosition p : PlotHomePosition.values()) { for(PlotHomePosition p : PlotHomePosition.values()) {
if (p.isMatching(args[1])) { if(p.isMatching(args[1])) position = p;
position = p;
} }
} if(position == null) {
if (position == null) {
PlayerFunctions.sendMessage(plr, C.INVALID_POSITION); PlayerFunctions.sendMessage(plr, C.INVALID_POSITION);
return false; return false;
} }
@@ -186,14 +185,14 @@ public class Set extends SubCommand {
return true; return true;
} }
if (args[0].equalsIgnoreCase("alias")) { if(args[0].equalsIgnoreCase("alias")) {
if (args.length < 2) { if(args.length < 2) {
PlayerFunctions.sendMessage(plr, C.MISSING_ALIAS); PlayerFunctions.sendMessage(plr, C.MISSING_ALIAS);
return false; return false;
} }
String alias = args[1]; String alias = args[1];
for (Plot p : PlotMain.getPlots()) { for(Plot p : PlotMain.getPlots()) {
if (p.settings.getAlias().equalsIgnoreCase(alias)) { if(p.settings.getAlias().equalsIgnoreCase(alias)) {
PlayerFunctions.sendMessage(plr, C.ALIAS_IS_TAKEN); PlayerFunctions.sendMessage(plr, C.ALIAS_IS_TAKEN);
return false; return false;
} }
@@ -202,19 +201,19 @@ public class Set extends SubCommand {
PlayerFunctions.sendMessage(plr, C.ALIAS_SET_TO.s().replaceAll("%alias%", alias)); PlayerFunctions.sendMessage(plr, C.ALIAS_SET_TO.s().replaceAll("%alias%", alias));
return true; return true;
} }
if (args[0].equalsIgnoreCase("biome")) { if(args[0].equalsIgnoreCase("biome")) {
if (args.length < 2) { if(args.length < 2) {
PlayerFunctions.sendMessage(plr, C.NEED_BIOME); PlayerFunctions.sendMessage(plr, C.NEED_BIOME);
return true; return true;
} }
Biome biome = null; Biome biome = null;
for (Biome b : Biome.values()) { for(Biome b : Biome.values()) {
if (b.toString().equalsIgnoreCase(args[1])) { if(b.toString().equalsIgnoreCase(args[1])) {
biome = b; biome = b;
break; break;
} }
} }
if (biome == null) { if(biome == null) {
PlayerFunctions.sendMessage(plr, getBiomeList(Arrays.asList(Biome.values()))); PlayerFunctions.sendMessage(plr, getBiomeList(Arrays.asList(Biome.values())));
return true; return true;
} }
@@ -222,54 +221,54 @@ public class Set extends SubCommand {
PlayerFunctions.sendMessage(plr, C.BIOME_SET_TO.s() + biome.toString().toLowerCase()); PlayerFunctions.sendMessage(plr, C.BIOME_SET_TO.s() + biome.toString().toLowerCase());
return true; return true;
} }
if (args[0].equalsIgnoreCase("wall")) { if(args[0].equalsIgnoreCase("wall")) {
PlotWorld plotworld = PlotMain.getWorldSettings(plr.getWorld()); PlotWorld plotworld = PlotMain.getWorldSettings(plr.getWorld());
if (plotworld == null) { if (plotworld==null) {
PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT_WORLD); PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
return true; return true;
} }
if (args.length < 2) { if(args.length < 2) {
PlayerFunctions.sendMessage(plr, C.NEED_BLOCK); PlayerFunctions.sendMessage(plr, C.NEED_BLOCK);
return true; return true;
} }
Material material = null; Material material = null;
for (Material m : PlotWorld.BLOCKS) { for(Material m : plotworld.BLOCKS) {
if (m.toString().equalsIgnoreCase(args[1])) { if(m.toString().equalsIgnoreCase(args[1])) {
material = m; material = m;
break; break;
} }
} }
if (material == null) { if(material == null) {
PlayerFunctions.sendMessage(plr, getBlockList(PlotWorld.BLOCKS)); PlayerFunctions.sendMessage(plr, getBlockList(plotworld.BLOCKS));
return true; return true;
} }
byte data = 0; byte data = 0;
if (args.length > 2) { if(args.length > 2) {
try { try {
data = (byte) Integer.parseInt(args[2]); data = (byte) Integer.parseInt(args[2]);
} catch (Exception e) { } catch(Exception e) {
PlayerFunctions.sendMessage(plr, C.NOT_VALID_DATA); PlayerFunctions.sendMessage(plr, C.NOT_VALID_DATA);
return true; return true;
} }
} }
PlayerFunctions.sendMessage(plr, C.GENERATING_WALL); PlayerFunctions.sendMessage(plr, C.GENERATING_WALL);
PlotHelper.adjustWall(plr.getWorld(), plot, (short) material.getId(), data); PlotHelper.adjustWall(plr.getWorld(), plot, (short)material.getId(), data);
return true; return true;
} }
if (args[0].equalsIgnoreCase("floor")) { if(args[0].equalsIgnoreCase("floor")) {
if (args.length < 2) { if(args.length < 2) {
PlayerFunctions.sendMessage(plr, C.NEED_BLOCK); PlayerFunctions.sendMessage(plr, C.NEED_BLOCK);
return true; return true;
} }
PlotWorld plotworld = PlotMain.getWorldSettings(plr.getWorld()); PlotWorld plotworld = PlotMain.getWorldSettings(plr.getWorld());
if (plotworld == null) { if (plotworld==null) {
PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT_WORLD); PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
return true; return true;
} }
// //
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
ArrayList<Material> materials = (ArrayList<Material>) PlotWorld.BLOCKS.clone(); ArrayList<Material> materials = (ArrayList<Material>) plotworld.BLOCKS.clone();
materials.add(Material.AIR); materials.add(Material.AIR);
// //
String[] strings = args[1].split(","); String[] strings = args[1].split(",");
@@ -282,26 +281,26 @@ public class Set extends SubCommand {
byte b = (byte) 0; byte b = (byte) 0;
Material m = null; Material m = null;
// //
for (String s : strings) { for(String s : strings) {
s = s.replaceAll(",", ""); s = s.replaceAll(",", "");
String[] ss = s.split(";"); String[] ss = s.split(";");
ss[0] = ss[0].replaceAll(";", ""); ss[0] = ss[0].replaceAll(";", "");
for (Material ma : materials) { for(Material ma : materials) {
if (ma.toString().equalsIgnoreCase(ss[0])) { if(ma.toString().equalsIgnoreCase(ss[0])) {
m = ma; m = ma;
} }
} }
if (m == null) { if(m == null) {
PlayerFunctions.sendMessage(plr, C.NOT_VALID_BLOCK); PlayerFunctions.sendMessage(plr, C.NOT_VALID_BLOCK);
return true; return true;
} }
if (ss.length == 1) { if(ss.length == 1) {
data[index] = (byte) 0; data[index] = (byte) 0;
material[index] = m; material[index] = m;
} else { } else {
try { try {
b = (byte) Integer.parseInt(ss[1]); b = (byte) Integer.parseInt(ss[1]);
} catch (Exception e) { } catch(Exception e) {
PlayerFunctions.sendMessage(plr, C.NOT_VALID_DATA); PlayerFunctions.sendMessage(plr, C.NOT_VALID_DATA);
return true; return true;
} }
@@ -313,38 +312,38 @@ public class Set extends SubCommand {
PlotHelper.setFloor(plr, plot, material, data); PlotHelper.setFloor(plr, plot, material, data);
return true; return true;
} }
if (args[0].equalsIgnoreCase("wall_filling")) { if(args[0].equalsIgnoreCase("wall_filling")) {
if (args.length < 2) { if(args.length < 2) {
PlayerFunctions.sendMessage(plr, C.NEED_BLOCK); PlayerFunctions.sendMessage(plr, C.NEED_BLOCK);
return true; return true;
} }
PlotWorld plotworld = PlotMain.getWorldSettings(plr.getWorld()); PlotWorld plotworld = PlotMain.getWorldSettings(plr.getWorld());
if (plotworld == null) { if (plotworld==null) {
PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT_WORLD); PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
return true; return true;
} }
Material material = null; Material material = null;
for (Material m : PlotWorld.BLOCKS) { for(Material m : plotworld.BLOCKS) {
if (m.toString().equalsIgnoreCase(args[1])) { if(m.toString().equalsIgnoreCase(args[1])) {
material = m; material = m;
break; break;
} }
} }
if (material == null) { if(material == null) {
PlayerFunctions.sendMessage(plr, getBlockList(PlotWorld.BLOCKS)); PlayerFunctions.sendMessage(plr, getBlockList(plotworld.BLOCKS));
return true; return true;
} }
byte data = 0; byte data = 0;
if (args.length > 2) { if(args.length > 2) {
try { try {
data = (byte) Integer.parseInt(args[2]); data = (byte) Integer.parseInt(args[2]);
} catch (Exception e) { } catch(Exception e) {
PlayerFunctions.sendMessage(plr, C.NOT_VALID_DATA); PlayerFunctions.sendMessage(plr, C.NOT_VALID_DATA);
return true; return true;
} }
} }
PlotHelper.adjustWallFilling(plr, plr.getWorld(), plot, (short) material.getId(), data); PlotHelper.adjustWallFilling(plr, plr.getWorld(), plot, (short)material.getId(), data);
return true; return true;
} }
PlayerFunctions.sendMessage(plr, "Not a valid option. Use {TODO: Insert list.}"); PlayerFunctions.sendMessage(plr, "Not a valid option. Use {TODO: Insert list.}");
@@ -365,7 +364,7 @@ public class Set extends SubCommand {
private String getArgumentList(String[] strings) { private String getArgumentList(String[] strings) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for (String s : strings) { for(String s : strings) {
builder.append(getString(s)); builder.append(getString(s));
} }
return builder.toString().substring(1, builder.toString().length() - 1); return builder.toString().substring(1, builder.toString().length() - 1);
@@ -374,19 +373,20 @@ public class Set extends SubCommand {
private String getBiomeList(List<Biome> biomes) { private String getBiomeList(List<Biome> biomes) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append(ChatColor.translateAlternateColorCodes('&', C.NOT_VALID_BLOCK_LIST_HEADER.s())); builder.append(ChatColor.translateAlternateColorCodes('&', C.NOT_VALID_BLOCK_LIST_HEADER.s()));
for (Biome b : biomes) { for(Biome b : biomes) {
builder.append(getBiome(b)); builder.append(getBiome(b));
} }
return builder.toString().substring(1, builder.toString().length() - 1); return builder.toString().substring(1,builder.toString().length() - 1);
} }
private String getBlockList(List<Material> blocks) { private String getBlockList(List<Material> blocks) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append(ChatColor.translateAlternateColorCodes('&', C.NOT_VALID_BLOCK_LIST_HEADER.s())); builder.append(ChatColor.translateAlternateColorCodes('&', C.NOT_VALID_BLOCK_LIST_HEADER.s()));
for (Material b : blocks) { for(Material b : blocks) {
builder.append(getMaterial(b)); builder.append(getMaterial(b));
} }
return builder.toString().substring(1, builder.toString().length() - 1); return builder.toString().substring(1,builder.toString().length() - 1);
} }
} }