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

Last tests for v0.4.

Browse Source
This commit is contained in:
taoneill 2011-01-22 15:37:31 -05:00
parent 81495be56b
commit 41f7bc881b
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1211,7 +1211,7 @@ public class War extends JavaPlugin {
if(test != null) { if(test != null) {
this.Permissions = (Permissions)test; this.Permissions = (Permissions)test;
} else { } else {
info(str("Permission system not enabled. Defaulting to regular War config.")); info("Permissions system not enabled. Defaulting to regular War config.");
} }
} }
} }

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

@ -73,17 +73,15 @@ public class WarPlayerListener extends PlayerListener {
boolean isMaker = war.isZoneMaker(player); boolean isMaker = war.isZoneMaker(player);
// Zone walls // Zone walls
if(!isMaker) { // zone makers don't get bothered with guard walls
Warzone nearbyZone = war.zoneOfZoneWallAtProximity(playerLoc); Warzone nearbyZone = war.zoneOfZoneWallAtProximity(playerLoc);
if(nearbyZone != null) { if(nearbyZone != null && !isMaker) { // zone makers don't get bothered with guard walls
nearbyZone.protectZoneWallAgainstPlayer(player); nearbyZone.protectZoneWallAgainstPlayer(player);
} else { } else { // zone makers still need to delete their walls
// make sure to delete any wall guards as you leave // make sure to delete any wall guards as you leave
for(Warzone zone : war.getWarzones()) { for(Warzone zone : war.getWarzones()) {
zone.dropZoneWallGuardIfAny(player); zone.dropZoneWallGuardIfAny(player);
} }
} }
}
Warzone playerWarzone = war.getPlayerTeamWarzone(player.getName()); Warzone playerWarzone = war.getPlayerTeamWarzone(player.getName());
// this uses the teams, so it asks: get the player's team's warzone, to be clearer // this uses the teams, so it asks: get the player's team's warzone, to be clearer