summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-12-29 18:40:44 -0600
committerfeildmaster <admin@feildmaster.com>2012-12-29 18:41:23 -0600
commit984919f3a9642b6404a032cefae06067fabaff16 (patch)
treee97e9e2e0480d5aae96421aca38029617ae0b12a /src/main/java/org
parentff54598b0546c41b7ae826fa2d802df44f3b86dd (diff)
downloadbukkit-984919f3a9642b6404a032cefae06067fabaff16.tar
bukkit-984919f3a9642b6404a032cefae06067fabaff16.tar.gz
bukkit-984919f3a9642b6404a032cefae06067fabaff16.tar.lz
bukkit-984919f3a9642b6404a032cefae06067fabaff16.tar.xz
bukkit-984919f3a9642b6404a032cefae06067fabaff16.zip
Don't allow nulls in PlayerRespawnEvent. Fixes BUKKIT-2571
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
index dcfc8783..48a07c29 100644
--- a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
@@ -1,5 +1,6 @@
package org.bukkit.event.player;
+import org.apache.commons.lang.Validate;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
@@ -30,6 +31,9 @@ public class PlayerRespawnEvent extends PlayerEvent {
* @param respawnLocation new location for the respawn
*/
public void setRespawnLocation(Location respawnLocation) {
+ Validate.notNull(respawnLocation, "Respawn location can not be null");
+ Validate.notNull(respawnLocation.getWorld(), "Respawn world can not be null");
+
this.respawnLocation = respawnLocation;
}