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

v0.3 Patton tested with Bukkit snapshot of build #87.

Browse Source
This commit is contained in:
taoneill 2011-01-19 02:49:14 -05:00
parent 3f164f60c5
commit 88d8632931
2 changed files with 2 additions and 1 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

@ -87,7 +87,7 @@ public class War extends JavaPlugin {
pm.registerEvent(Event.Type.PLAYER_LOGIN, playerListener, Priority.Normal, this); pm.registerEvent(Event.Type.PLAYER_LOGIN, playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Normal, this); pm.registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.PLAYER_MOVE, playerListener, Priority.Highest, this); pm.registerEvent(Event.Type.PLAYER_MOVE, playerListener, Priority.High, this);
pm.registerEvent(Event.Type.ENTITY_DAMAGEDBY_ENTITY, entityListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_DAMAGEDBY_ENTITY, entityListener, Priority.Normal, this);

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

@ -231,6 +231,7 @@ public class WarPlayerListener extends PlayerListener {
} else if (zone.getLobby().isInWarHubLinkGate(to)){ } else if (zone.getLobby().isInWarHubLinkGate(to)){
dropFromOldTeamIfAny(player); dropFromOldTeamIfAny(player);
event.setTo(war.getWarHub().getLocation()); event.setTo(war.getWarHub().getLocation());
player.teleportTo(war.getWarHub().getLocation());
player.sendMessage(war.str("Welcome to the War hub.")); player.sendMessage(war.str("Welcome to the War hub."));
} }
} else if(zone.getLobby().isLeavingZone(to)) { // already in a team and in warzone, leaving } else if(zone.getLobby().isLeavingZone(to)) { // already in a team and in warzone, leaving