diff --git a/src/com/palmergames/bukkit/towny/war/eventwar/TownScoredEvent.java b/src/com/palmergames/bukkit/towny/war/eventwar/TownScoredEvent.java index 3446446370..567034d9ba 100644 --- a/src/com/palmergames/bukkit/towny/war/eventwar/TownScoredEvent.java +++ b/src/com/palmergames/bukkit/towny/war/eventwar/TownScoredEvent.java @@ -11,6 +11,12 @@ public class TownScoredEvent extends Event { @Override public HandlerList getHandlers() { + + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; } @@ -18,6 +24,7 @@ public HandlerList getHandlers() { public TownScoredEvent (Town town) { + super(); this.town = town; } diff --git a/src/com/palmergames/bukkit/towny/war/eventwar/WarListener.java b/src/com/palmergames/bukkit/towny/war/eventwar/WarListener.java index 320ca1950b..8c7fd5a70c 100644 --- a/src/com/palmergames/bukkit/towny/war/eventwar/WarListener.java +++ b/src/com/palmergames/bukkit/towny/war/eventwar/WarListener.java @@ -9,6 +9,8 @@ import org.bukkit.event.player.PlayerQuitEvent; import com.palmergames.bukkit.towny.Towny; +import com.palmergames.bukkit.towny.TownyMessaging; +import com.palmergames.bukkit.towny.event.PlayerChangePlotEvent; import com.palmergames.bukkit.towny.exceptions.NotRegisteredException; import com.palmergames.bukkit.towny.object.Resident; import com.palmergames.bukkit.towny.object.Town; @@ -19,15 +21,16 @@ public class WarListener implements Listener { Towny plugin; - + public WarListener(Towny plugin) { this.plugin = plugin; } - + @EventHandler public void onPlayerQuit(PlayerQuitEvent event) { + TownyMessaging.sendDebugMsg("[HUD] player quit game"); War warEvent = plugin.getTownyUniverse().getWarEvent(); //Removes a player from the HUD list on logout Player p = event.getPlayer(); @@ -35,23 +38,22 @@ public void onPlayerQuit(PlayerQuitEvent event) warEvent.togglePlayerHud(p); } } - + @EventHandler - public void onPlayerMoveDuringWar(PlayerMoveEvent event) throws NotRegisteredException + public void onPlayerMoveDuringWar(PlayerChangePlotEvent event) throws NotRegisteredException { + TownyMessaging.sendDebugMsg("[HUD] player change plot"); War warEvent = plugin.getTownyUniverse().getWarEvent(); Player p = event.getPlayer(); if (!warEvent.getPlayersWithHUD().containsKey(p)) return; - if (!event.getFrom().getChunk().equals(event.getTo().getChunk())) - { - warEvent.getPlayersWithHUD().get(p).updateLocation(); - } + warEvent.getPlayersWithHUD().get(p).updateLocation(); } - + @EventHandler public void onTownScored (TownScoredEvent event) { + TownyMessaging.sendDebugMsg("[HUD] town scored event caught"); //Update town score War warEvent = plugin.getTownyUniverse().getWarEvent(); for (Resident r : event.getTown().getResidents())