diff options
| -rw-r--r-- | src/main/java/org/bukkit/event/player/PlayerMoveEvent.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java index 8debcda7..d56b7e40 100644 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java @@ -64,7 +64,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable { * @param from New location to mark as the players previous location */ public void setFrom(Location from) { - validateLocation(to); + validateLocation(from); this.from = from; } @@ -88,7 +88,8 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable { } private void validateLocation(Location loc) { - Preconditions.checkArgument(loc != null, "Cannot use location with null world!"); + Preconditions.checkArgument(loc != null, "Cannot use null location!"); + Preconditions.checkArgument(loc.getWorld() != null, "Cannot use null location with null world!"); } @Override |