From b3679e8829c0bf8e4527b8ed1f13c9122a82d03a Mon Sep 17 00:00:00 2001
From: jedk1 <jedkristian@live.com>
Date: Mon, 22 Feb 2016 17:01:54 +0000
Subject: [PATCH] Fix DeathMsgs & ReloadEvent

---
 src/com/projectkorra/projectkorra/PKListener.java      |  2 +-
 .../projectkorra/event/BendingReloadEvent.java         | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/com/projectkorra/projectkorra/PKListener.java b/src/com/projectkorra/projectkorra/PKListener.java
index f1d7c2cb..e9985624 100644
--- a/src/com/projectkorra/projectkorra/PKListener.java
+++ b/src/com/projectkorra/projectkorra/PKListener.java
@@ -740,7 +740,7 @@ public class PKListener implements Listener {
 			
 			StringBuilder sb = new StringBuilder();
 			sb.append(ability.getElement().getColor());
-			sb.append(event.getAbility());
+			sb.append(event.getAbility().getName());
 			BENDING_PLAYER_DEATH.put((Player) event.getEntity(), sb.toString());
 			final Player player = (Player) event.getEntity();
 
diff --git a/src/com/projectkorra/projectkorra/event/BendingReloadEvent.java b/src/com/projectkorra/projectkorra/event/BendingReloadEvent.java
index e7b8358c..99c7a6cd 100644
--- a/src/com/projectkorra/projectkorra/event/BendingReloadEvent.java
+++ b/src/com/projectkorra/projectkorra/event/BendingReloadEvent.java
@@ -12,9 +12,10 @@ public class BendingReloadEvent extends Event implements Cancellable {
 
 	private static final HandlerList handlers = new HandlerList();
 	private boolean cancelled = false;
+	private CommandSender sender;
 	
 	public BendingReloadEvent(CommandSender sender) {
-
+		this.sender = sender;
 	}
 
 	public HandlerList getHandlers() {
@@ -25,6 +26,13 @@ public class BendingReloadEvent extends Event implements Cancellable {
 		return handlers;
 	}
 
+	/**
+	 * @return Who called the reload
+	 */
+	public CommandSender getSender() {
+		return sender;
+	}
+	
 	/**
 	 * @return Whether the event is cancelled
 	 */