Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2025-02-08 15:31:20 +01:00
Code Issues Projects Releases Wiki Activity

Added zone maker exceptions. Got to nail down the spammy death problem.

Browse Source
This commit is contained in:
taoneill 2011-01-15 23:22:55 -05:00
parent 8bafd9f372
commit 567718662a
2 changed files with 85 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,23 +275,34 @@ public class WarPlayerListener extends PlayerListener {
} else {
// change existing warzone
if(arguments[1].equals("northwest") || arguments[1].equals("nw")) {
int reset = warzone.getVolume().resetBlocks();
warzone.setNorthwest(player.getLocation());
warzone.saveState();
warzone.initializeZone();
message += "Northwesternmost point set at x=" + (int)warzone.getNorthwest().getBlockX()
+ " z=" + (int)warzone.getNorthwest().getBlockZ() + " on warzone " + warzone.getName() + ". " +
reset + " blocks reset. Zone saved.";
if(warzone.getSoutheast() != null
&& (player.getLocation().getBlockX() >= warzone.getSoutheast().getBlockX()
|| player.getLocation().getBlockZ() <= warzone.getSoutheast().getBlockZ())) {
player.sendMessage(war.str("You must place that corner northwest relative to the existing southeast corner!"));
} else {
int reset = warzone.getVolume().resetBlocks();
warzone.setNorthwest(player.getLocation());
warzone.saveState();
warzone.initializeZone();
message += "Northwesternmost point set at x=" + (int)warzone.getNorthwest().getBlockX()
+ " z=" + (int)warzone.getNorthwest().getBlockZ() + " on warzone " + warzone.getName() + ". " +
reset + " blocks reset. Zone saved.";
}
} else {
int reset = warzone.getVolume().resetBlocks();
warzone.setSoutheast(player.getLocation());
warzone.saveState();
warzone.initializeZone();
if(warzone.getNorthwest() != null
&& (player.getLocation().getBlockX() <= warzone.getNorthwest().getBlockX()
|| player.getLocation().getBlockZ() >= warzone.getNorthwest().getBlockZ())) {
player.sendMessage(war.str("You must place that corner southeast relative to the existing northwest corner!"));
} else {
int reset = warzone.getVolume().resetBlocks();
warzone.setSoutheast(player.getLocation());
warzone.saveState();
warzone.initializeZone();
message += "Southeasternmost point set at x=" + (int)warzone.getSoutheast().getBlockX()
+ " z=" + (int)warzone.getSoutheast().getBlockZ() + " on warzone " + warzone.getName() + ". " +
reset + " blocks reset. Zone saved.";
message += "Southeasternmost point set at x=" + (int)warzone.getSoutheast().getBlockX()
+ " z=" + (int)warzone.getSoutheast().getBlockZ() + " on warzone " + warzone.getName() + ". " +
reset + " blocks reset. Zone saved.";
}
}
WarzoneMapper.save(war, warzone, true);
}
@ -604,8 +615,8 @@ public class WarPlayerListener extends PlayerListener {
if(playerWarzone != null) {
Team team = war.getPlayerTeam(player.getName());
// Player belongs to a warzone team but is outside: he just died! Handle death!
if(to != null && war.warzone(player.getLocation()) == null && team != null) {
// Player belongs to a warzone team but is outside: he just died! Handle death! Exempt the zone maker.
if(from != null && war.warzone(player.getLocation()) == null && team != null && !war.isZoneMaker(player.getName())) {
// teleport to team spawn upon death
boolean roundOver = false;
@ -623,7 +634,6 @@ public class WarPlayerListener extends PlayerListener {
t.resetSign();
}
}
playerWarzone.endRound();
playerWarzone.getVolume().resetBlocks();
playerWarzone.initializeZone();
roundOver = true;
@ -651,7 +661,7 @@ public class WarPlayerListener extends PlayerListener {
player.setHealth(20);
player.sendMessage(war.str("Your dance pleases the monument's voodoo. You gain full health!"));
}
} else if (war.inAnyWarzone(player.getLocation())) { // player is not in any team, but inside warzone boundaries, get him out
} else if (war.inAnyWarzone(player.getLocation()) && !war.isZoneMaker(player.getName())) { // player is not in any team, but inside warzone boundaries, get him out
Warzone zone = war.warzone(player.getLocation());
event.setTo(zone.getTeleport());
player.sendMessage(war.str("You can't be inside a warzone without a team."));
@ -667,7 +677,7 @@ public class WarPlayerListener extends PlayerListener {
if(zone.getLobby().isAutoAssignGate(to)) {
dropFromOldTeamIfAny(player);
zone.autoAssign(event, player);
} else if (zone.getLobby().isInTeamGate(TeamMaterials.TEAMDIAMOND, from)){
} else if (zone.getLobby().isInTeamGate(TeamMaterials.TEAMDIAMOND, to)){
dropFromOldTeamIfAny(player);
Team diamondTeam = zone.getTeamByMaterial(TeamMaterials.TEAMDIAMOND);
diamondTeam.addPlayer(player);
@ -702,6 +712,19 @@ public class WarPlayerListener extends PlayerListener {
event.setTo(to);
player.teleportTo(war.getWarHub().getLocation());
}
} else if(war.inAnyWarzone(event.getFrom())) { // already in a team and in warzone, leaving
if(zone.getLobby().isAutoAssignGate(to)
|| zone.getLobby().isInTeamGate(TeamMaterials.TEAMDIAMOND, to)
|| zone.getLobby().isInTeamGate(TeamMaterials.TEAMIRON, to)
|| zone.getLobby().isInTeamGate(TeamMaterials.TEAMGOLD, to)) {
// same as leave, except event.setTo
Team playerTeam = war.getPlayerTeam(player.getName());
playerTeam.removePlayer(player.getName());
event.setTo(playerWarzone.getTeleport());
player.sendMessage(war.str("Left the zone."));
playerWarzone.restorePlayerInventory(player);
player.sendMessage(war.str("Your inventory has (hopefully) been restored."));
}
}
}
}

64
war/src/main/java/com/tommytony/war/Warzone.java
View File

@ -206,15 +206,6 @@ public class Warzone {
*/
public void initializeZone() {
if(ready() && volume.isSaved()){
// add wall outlines
if(drawZoneOutline) {
addZoneOutline(BlockFace.North);
addZoneOutline(BlockFace.East);
addZoneOutline(BlockFace.South);
addZoneOutline(BlockFace.West);
}
// everyone back to team spawn with full health
for(Team team : teams) {
for(Player player : team.getPlayers()) {
@ -225,22 +216,49 @@ public class Warzone {
team.resetSign();
}
// reset monuments
for(Monument monument : monuments) {
monument.getVolume().resetBlocks();
monument.addMonumentBlocks();
}
// reset lobby
if(lobby != null) {
lobby.initialize();
}
this.setNorthwest(this.getNorthwest());
this.setSoutheast(this.getSoutheast());
initZone();
}
}
public void initializeZone(PlayerMoveEvent event) {
if(ready() && volume.isSaved()){
// everyone back to team spawn with full health
for(Team team : teams) {
for(Player player : team.getPlayers()) {
if(player.getName().equals(event.getPlayer().getName())) respawnPlayer(event, team, player);
respawnPlayer(team, player);
}
team.setRemainingTickets(lifePool);
team.setTeamSpawn(team.getTeamSpawn());
team.resetSign();
}
}
}
private void initZone() {
// add wall outlines
if(drawZoneOutline) {
addZoneOutline(BlockFace.North);
addZoneOutline(BlockFace.East);
addZoneOutline(BlockFace.South);
addZoneOutline(BlockFace.West);
}
// reset monuments
for(Monument monument : monuments) {
monument.getVolume().resetBlocks();
monument.addMonumentBlocks();
}
// reset lobby
if(lobby != null) {
lobby.initialize();
}
this.setNorthwest(this.getNorthwest());
this.setSoutheast(this.getSoutheast());
}
private void addZoneOutline(BlockFace wall) {
int c1maxY = world.getHighestBlockYAt(volume.getMinX(), volume.getMinZ());
int c2maxY = world.getHighestBlockYAt(volume.getMaxX(), volume.getMaxZ());
@ -350,7 +368,7 @@ public class Warzone {
playerInv.setHelmet(new ItemStack(Material.IRON_BOOTS));
}
player.setHealth(20);
//player.setHealth(20);
}