Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-11-27 12:46:11 +01:00
Code Issues Projects Releases Wiki Activity

Closes gh-188. Closes gh-192. Closes gh-193. It seems I fixed the right-click-itme-disappear bug earlier. Updated /join usage. Added /zm as alias for /zonemaker. This is War v1.5.

Browse Source
This commit is contained in:
taoneill 2011-05-21 10:53:10 -04:00
parent e1417811cf
commit 297ac1e460
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
war/src/main/java/bukkit/tommytony/war/War.java
View File

@ -248,7 +248,7 @@ public class War extends JavaPlugin {
performDeleteWarhub(player); performDeleteWarhub(player);
} else if(command.equals("setwarconfig") || command.equals("warcfg")) { } else if(command.equals("setwarconfig") || command.equals("warcfg")) {
performSetWarConfig(player, arguments); performSetWarConfig(player, arguments);
} else if(command.equals("zonemaker")) { } else if(command.equals("zonemaker") || command.equals("zm")) {
performZonemakerAsZonemaker(player, arguments); performZonemakerAsZonemaker(player, arguments);
} else if(command.equals("unloadwar")) { } else if(command.equals("unloadwar")) {
unloadWar(); unloadWar();
@ -271,7 +271,7 @@ public class War extends JavaPlugin {
|| command.equals("setwarconfig") || command.equals("setwarconfig")
|| command.equals("unloadwar")) { || command.equals("unloadwar")) {
this.badMsg(player, "You can't do this if you are not a warzone maker."); this.badMsg(player, "You can't do this if you are not a warzone maker.");
} else if (command.equals("zonemaker")) { } else if (command.equals("zonemaker") || command.equals("zm")) {
performZonemakerAsPlayer(player); performZonemakerAsPlayer(player);
} }
} }
@ -885,7 +885,7 @@ public class War extends JavaPlugin {
public void performJoin(Player player, String[] arguments) { public void performJoin(Player player, String[] arguments) {
if(arguments.length < 1 || (!this.inAnyWarzone(player.getLocation()) && !this.inAnyWarzoneLobby(player.getLocation())) if(arguments.length < 1 || (!this.inAnyWarzone(player.getLocation()) && !this.inAnyWarzoneLobby(player.getLocation()))
|| (arguments.length > 0 && TeamKinds.teamKindFromString(arguments[0]) == null)) { || (arguments.length > 0 && TeamKinds.teamKindFromString(arguments[0]) == null)) {
this.badMsg(player, "Usage: /join <diamond/iron/gold/d/i/g>." + this.badMsg(player, "Usage: /join <diamond/iron/gold/red/blue/green/etc.>." +
" Teams are warzone specific." + " Teams are warzone specific." +
" You must be inside a warzone or zone lobby to join a team." + " You must be inside a warzone or zone lobby to join a team." +
" Use as an alternative to walking through the team gate."); " Use as an alternative to walking through the team gate.");

3
war/src/main/java/plugin.yml
View File

@ -126,6 +126,9 @@ commands:
usage: usage:
- /zonemaker - /zonemaker
- /zonemaker <new-or-kicked-zone-maker-name> - /zonemaker <new-or-kicked-zone-maker-name>
zm:
description: (War) Alias for /zonemaker
usage:
# 3- War hub # 3- War hub
setwarhub: setwarhub:
description: (War) Create or moves a West-facing wall of portals. One portal per warzone. Warzones get a portal back to the warhub. description: (War) Create or moves a West-facing wall of portals. One portal per warzone. Warzones get a portal back to the warhub.

3
war/target/classes/plugin.yml
View File

@ -126,6 +126,9 @@ commands:
usage: usage:
- /zonemaker - /zonemaker
- /zonemaker <new-or-kicked-zone-maker-name> - /zonemaker <new-or-kicked-zone-maker-name>
zm:
description: (War) Alias for /zonemaker
usage:
# 3- War hub # 3- War hub
setwarhub: setwarhub:
description: (War) Create or moves a West-facing wall of portals. One portal per warzone. Warzones get a portal back to the warhub. description: (War) Create or moves a West-facing wall of portals. One portal per warzone. Warzones get a portal back to the warhub.