skywalker3200/MobArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add option of showing both regions in Setup Mode.

Browse Source
This commit is contained in:
garbagemule
2014-04-26 23:27:30 +02:00
parent 9fb579b2ff
commit aa77255b18
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/plugin.yml
+1 -1
View File
@@ -1,7 +1,7 @@
name: MobArena name: MobArena
author: garbagemule author: garbagemule
main: com.garbagemule.MobArena.MobArena main: com.garbagemule.MobArena.MobArena
version: 0.96.4.1 version: 0.96.4.2
softdepend: [Multiverse-Core,Towny,Heroes,MagicSpells,Vault] softdepend: [Multiverse-Core,Towny,Heroes,MagicSpells,Vault]
commands: commands:
ma: ma:
src/com/garbagemule/MobArena/commands/setup/SetupCommand.java
+19 -3
View File
@@ -574,7 +574,23 @@ public class SetupCommand implements Command, Listener {
String toShow = s.split(" ")[1].trim(); String toShow = s.split(" ")[1].trim();
// Regions // Regions
if (toShow.equalsIgnoreCase("ar")) { if (toShow.equalsIgnoreCase("r") || toShow.equalsIgnoreCase("regions")) {
if (region.isDefined()) {
region.showRegion(player);
if (region.isLobbyDefined()) {
region.showLobbyRegion(player);
next = formatYellow("Showing both %s.", "regions");
} else {
next = formatYellow("Showing %s (lobby region not defined).", "arena region");
}
} else if (region.isLobbyDefined()) {
region.showLobbyRegion(player);
next = formatYellow("Showing %s (arena region not defined).", "lobby region");
} else {
next = "No regions have been defined yet.";
}
return this;
} else if (toShow.equalsIgnoreCase("ar")) {
if (region.isDefined()) { if (region.isDefined()) {
next = formatYellow("Showing %s.", "arena region"); next = formatYellow("Showing %s.", "arena region");
region.showRegion(player); region.showRegion(player);
@@ -662,7 +678,7 @@ public class SetupCommand implements Command, Listener {
buffy.append("\nUsage: &eshow <thing>"); buffy.append("\nUsage: &eshow <thing>");
buffy.append("\n\n&r&7Possible things to show:"); buffy.append("\n\n&r&7Possible things to show:");
buffy.append("\n&r&7 regions: &rar&7 (arena region) or &rlr&7 (lobby region)"); buffy.append("\n&r&7 regions: &rar&7 (arena region) or &rlr&7 (lobby region) or &rr&7 (both)");
buffy.append("\n&r&7 warps: &rarena&7, &rlobby&7, &rspec&7, or &rexit"); buffy.append("\n&r&7 warps: &rarena&7, &rlobby&7, &rspec&7, or &rexit");
buffy.append("\n&r&7 points: &rspawns&7 or &rchests&7"); buffy.append("\n&r&7 points: &rspawns&7 or &rchests&7");
@@ -735,7 +751,7 @@ public class SetupCommand implements Command, Listener {
private static final String MISSING = "miss(ing)?"; private static final String MISSING = "miss(ing)?";
private static final String EXPAND = "exp(and)? (a|l)r [1-9][0-9]* (up|down|out)"; private static final String EXPAND = "exp(and)? (a|l)r [1-9][0-9]* (up|down|out)";
private static final String EXPHELP = "exp(and)?"; private static final String EXPHELP = "exp(and)?";
private static final String SHOW = "show (ar|lr|arena|lobby|spec(tator)?|exit|sp(awn(point)?s?)?|c((hest(s)?)?|on(tainer(s)?)?))"; private static final String SHOW = "show (r|ar|lr|arena|lobby|spec(tator)?|exit|sp(awn(point)?s?)?|c((hest(s)?)?|on(tainer(s)?)?))";
private static final String SHOWHELP = "show"; private static final String SHOWHELP = "show";
private static final String DONE = "done|quit|stop|end"; private static final String DONE = "done|quit|stop|end";
} }