From 0b6a017c3252ecafa415b341c3dca4ea2a137847 Mon Sep 17 00:00:00 2001 From: garbagemule Date: Tue, 6 Aug 2013 23:58:42 +0200 Subject: [PATCH] Include arena in ArenaKillEvent. --- src/com/garbagemule/MobArena/ArenaListener.java | 2 +- .../MobArena/events/ArenaKillEvent.java | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/com/garbagemule/MobArena/ArenaListener.java b/src/com/garbagemule/MobArena/ArenaListener.java index a8e68b8..d348a81 100644 --- a/src/com/garbagemule/MobArena/ArenaListener.java +++ b/src/com/garbagemule/MobArena/ArenaListener.java @@ -513,7 +513,7 @@ public class ArenaListener } private void callKillEvent(Player killer, Entity victim) { - ArenaKillEvent event = new ArenaKillEvent(killer, victim); + ArenaKillEvent event = new ArenaKillEvent(arena, killer, victim); plugin.getServer().getPluginManager().callEvent(event); } diff --git a/src/com/garbagemule/MobArena/events/ArenaKillEvent.java b/src/com/garbagemule/MobArena/events/ArenaKillEvent.java index df026b2..05507c0 100644 --- a/src/com/garbagemule/MobArena/events/ArenaKillEvent.java +++ b/src/com/garbagemule/MobArena/events/ArenaKillEvent.java @@ -1,5 +1,6 @@ package com.garbagemule.MobArena.events; +import com.garbagemule.MobArena.framework.Arena; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.Event; @@ -11,14 +12,25 @@ import org.bukkit.event.HandlerList; public class ArenaKillEvent extends Event { private static final HandlerList handlers = new HandlerList(); + private Arena arena; private Player killer; private Entity victim; - public ArenaKillEvent(Player killer, Entity victim) { + public ArenaKillEvent(Arena arena, Player killer, Entity victim) { + this.arena = arena; this.killer = killer; this.victim = victim; } + /** + * Get the arena the event happened in. + * + * @return an arena + */ + public Arena getArena() { + return arena; + } + /** * Get the killer. *