diff --git a/src/org/bukkit/event/player/PlayerChatEvent.java b/src/org/bukkit/event/player/PlayerChatEvent.java
index 0f358f55..d924b5e3 100644
--- a/src/org/bukkit/event/player/PlayerChatEvent.java
+++ b/src/org/bukkit/event/player/PlayerChatEvent.java
@@ -52,4 +52,14 @@ public class PlayerChatEvent extends PlayerEvent {
     public void setMessage(String message) {
         this.message = message;
     }
+
+    /**
+     * Sets the player that this message will display as, or command will be
+     * executed as
+     *
+     * @param player New player which this event will execute as
+     */
+    public void setPlayer(final Player player) {
+        this.player = player;
+    }
 }
diff --git a/src/org/bukkit/event/player/PlayerEvent.java b/src/org/bukkit/event/player/PlayerEvent.java
index 87012ea5..2e4ea068 100644
--- a/src/org/bukkit/event/player/PlayerEvent.java
+++ b/src/org/bukkit/event/player/PlayerEvent.java
@@ -8,7 +8,7 @@ import org.bukkit.event.Event;
  * Represents a player related event
  */
 public class PlayerEvent extends Event {
-    private final Player player;
+    protected Player player;
 
     public PlayerEvent(final Event.Type type, final Player who) {
         super(type);