502647092/Residence
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-24 21:46:16 +00:00
Code Releases Activity

fix some command error...

Browse Source 
Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092
2015-09-24 20:31:08 +08:00
parent 89b9e48ca8
commit 31ae195bab
6 changed files with 67 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLease.java
View File

@@ -18,7 +18,7 @@ public class CommandLease extends BaseCommand {
Residence plugin;
public CommandLease(final Residence plugin) {
super("?");
super("lease");
this.plugin = plugin;
setOnlyPlayerExecutable(true);
setMinimumArguments(2);

1
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLimits.java
View File

@@ -16,6 +16,7 @@ public class CommandLimits extends BaseCommand {
public CommandLimits(final Residence plugin) {
super("limits");
this.plugin = plugin;
setOnlyPlayerExecutable(true);
}
@Override

1
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandList.java
View File

@@ -16,6 +16,7 @@ public class CommandList extends BaseCommand {
public CommandList(final Residence plugin) {
super("list");
this.plugin = plugin;
setOnlyPlayerExecutable(true);
}
@Override

1
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListAll.java
View File

@@ -16,6 +16,7 @@ public class CommandListAll extends BaseCommand {
public CommandListAll(final Residence plugin) {
super("listall");
this.plugin = plugin;
setOnlyPlayerExecutable(true);
}
@Override

1
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListHidden.java
View File

@@ -18,6 +18,7 @@ public class CommandListHidden extends BaseCommand {
public CommandListHidden(final Residence plugin) {
super("listhidden");
this.plugin = plugin;
setOnlyPlayerExecutable(true);
}
@Override

120
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSelect.java
View File

@@ -26,7 +26,9 @@ public class CommandSelect extends BaseCommand {
public CommandSelect(final Residence plugin) {
super("select");
this.plugin = plugin;
setMinimumArguments(1);
setOnlyPlayerExecutable(true);
setPossibleArguments("请使用/res select ? 查看帮助");
setPermission("residence.select");
}
@@ -48,8 +50,13 @@ public class CommandSelect extends BaseCommand {
player.sendMessage(ChatColor.RED + language.getPhrase("SelectDiabled"));
return;
}
if (args.length == 1) {
if (args[0].equals("size") || args[0].equals("cost")) {
final String subcmd = args[0];
switch (args.length) {
case 1:
switch (subcmd) {
case "size":
case "cost":
if (smanager.hasPlacedBoth(player.getName())) {
try {
smanager.showSelectionInfo(player);
@@ -67,16 +74,17 @@ public class CommandSelect extends BaseCommand {
return;
}
}
} else if (args[0].equals("vert")) {
return;
case "vert":
smanager.vert(player, resadmin);
return;
} else if (args[0].equals("sky")) {
case "sky":
smanager.sky(player, resadmin);
return;
} else if (args[0].equals("bedrock")) {
case "bedrock":
smanager.bedrock(player, resadmin);
return;
} else if (args[0].equals("coords")) {
case "coords":
final Location playerLoc1 = smanager.getPlayerLoc1(player.getName());
if (playerLoc1 != null) {
player.sendMessage(ChatColor.GREEN + language.getPhrase("Primary.Selection") + ":" + ChatColor.AQUA + " (" + playerLoc1.getBlockX() + ", " + playerLoc1.getBlockY() + ", "
@@ -88,76 +96,72 @@ public class CommandSelect extends BaseCommand {
+ playerLoc2.getBlockZ() + ")");
}
return;
} else if (args[0].equals("chunk")) {
case "chunk":
smanager.selectChunk(player);
return;
} else if (args[0].equals("worldedit")) {
case "worldedit":
if (smanager.worldEdit(player)) {
player.sendMessage(ChatColor.GREEN + plugin.getLanguage().getPhrase("SelectionSuccess"));
}
return;
}
} else if (args.length == 2) {
if (args[0].equals("expand")) {
int amount;
try {
amount = Integer.parseInt(args[1]);
} catch (final Exception ex) {
player.sendMessage(ChatColor.RED + language.getPhrase("InvalidAmount"));
return;
}
return;
case 2:
int amount;
try {
amount = Integer.parseInt(args[1]);
} catch (final Exception ex) {
player.sendMessage(ChatColor.RED + language.getPhrase("InvalidAmount"));
return;
}
switch (subcmd) {
case "expand":
smanager.modify(player, false, amount);
return;
} else if (args[0].equals("shift")) {
int amount;
try {
amount = Integer.parseInt(args[1]);
} catch (final Exception ex) {
player.sendMessage(ChatColor.RED + language.getPhrase("InvalidAmount"));
return;
}
case "shift":
smanager.modify(player, true, amount);
return;
}
}
if (args.length > 0 && args[0].equals("residence")) {
String resName;
String areaName;
ClaimedResidence res = null;
if (args.length > 1) {
res = rmanager.getByName(args[1]);
} else {
res = rmanager.getByLoc(player.getLocation());
}
if (res == null) {
player.sendMessage(ChatColor.RED + language.getPhrase("InvalidResidence"));
return;
}
resName = res.getName();
CuboidArea area = null;
if (args.length > 2) {
area = res.getArea(args[2]);
areaName = args[2];
} else {
areaName = res.getAreaIDbyLoc(player.getLocation());
area = res.getArea(areaName);
}
if (area != null) {
smanager.placeLoc1(player, area.getHighLoc());
smanager.placeLoc2(player, area.getLowLoc());
player.sendMessage(ChatColor.GREEN + language.getPhrase("SelectionArea", ChatColor.GOLD + areaName + ChatColor.GREEN + "." + ChatColor.GOLD + resName + ChatColor.GREEN));
} else {
player.sendMessage(ChatColor.RED + language.getPhrase("AreaNonExist"));
}
return;
} else {
case 3:
try {
smanager.selectBySize(player, Integer.parseInt(args[0]), Integer.parseInt(args[1]), Integer.parseInt(args[2]));
return;
} catch (final Exception ex) {
player.sendMessage(ChatColor.RED + language.getPhrase("SelectionFail"));
return;
}
return;
default:
if (args.length > 0) {
String resName;
String areaName;
ClaimedResidence res = null;
if (args.length > 1) {
res = rmanager.getByName(args[0]);
} else {
res = rmanager.getByLoc(player.getLocation());
}
if (res == null) {
player.sendMessage(ChatColor.RED + language.getPhrase("InvalidResidence"));
return;
}
resName = res.getName();
CuboidArea area = null;
if (args.length > 2) {
area = res.getArea(args[1]);
areaName = args[1];
} else {
areaName = res.getAreaIDbyLoc(player.getLocation());
area = res.getArea(areaName);
}
if (area != null) {
smanager.placeLoc1(player, area.getHighLoc());
smanager.placeLoc2(player, area.getLowLoc());
player.sendMessage(ChatColor.GREEN + language.getPhrase("SelectionArea", ChatColor.GOLD + areaName + ChatColor.GREEN + "." + ChatColor.GOLD + resName + ChatColor.GREEN));
} else {
player.sendMessage(ChatColor.RED + language.getPhrase("AreaNonExist"));
}
}
return;
}
}