summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/NetServerHandler.java
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2011-12-04 11:04:14 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2011-12-04 11:04:14 +0000
commit55a532c2511a736c98b1be40b2c823d155096a05 (patch)
treed2218be9c4b8e149d0c7f8c8438ce8d84d591a92 /src/main/java/net/minecraft/server/NetServerHandler.java
parent645079be08da59a89b7e19f519f1384836753ca4 (diff)
downloadcraftbukkit-55a532c2511a736c98b1be40b2c823d155096a05.tar
craftbukkit-55a532c2511a736c98b1be40b2c823d155096a05.tar.gz
craftbukkit-55a532c2511a736c98b1be40b2c823d155096a05.tar.lz
craftbukkit-55a532c2511a736c98b1be40b2c823d155096a05.tar.xz
craftbukkit-55a532c2511a736c98b1be40b2c823d155096a05.zip
Indicate when a teleport event was triggered by ender pearls or unknown internal teleports
Diffstat (limited to 'src/main/java/net/minecraft/server/NetServerHandler.java')
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index 9727f641..3c4f9e81 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -190,7 +190,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
there to avoid any 'Moved wrongly' or 'Moved too quickly' errors.
We only do this if the Event was not cancelled. */
if (!to.equals(event.getTo()) && !event.isCancelled()) {
- this.player.getBukkitEntity().teleport(event.getTo());
+ this.player.getBukkitEntity().teleport(event.getTo(), PlayerTeleportEvent.TeleportCause.UNKNOWN);
return;
}
@@ -204,7 +204,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
}
if (Double.isNaN(packet10flying.x) || Double.isNaN(packet10flying.y) || Double.isNaN(packet10flying.z) || Double.isNaN(packet10flying.stance)) {
- player.teleport(player.getWorld().getSpawnLocation());
+ player.teleport(player.getWorld().getSpawnLocation(), PlayerTeleportEvent.TeleportCause.UNKNOWN);
System.err.println(player.getName() + " was caught trying to crash the server with an invalid position.");
player.kickPlayer("Nope!");
return;
@@ -386,7 +386,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
Player player = this.getPlayer();
Location from = player.getLocation();
Location to = new Location(this.getPlayer().getWorld(), d0, d1, d2, f, f1);
- PlayerTeleportEvent event = new PlayerTeleportEvent(player, from, to);
+ PlayerTeleportEvent event = new PlayerTeleportEvent(player, from, to, PlayerTeleportEvent.TeleportCause.UNKNOWN);
this.server.getPluginManager().callEvent(event);
from = event.getFrom();