Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 04:55:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix teleporting entities with vehicles/passengers teleporting you illegally. Fixes BUKKIT-2821

Browse Source 
Also some formatting...
This commit is contained in:
feildmaster 2012-11-20 18:15:00 -06:00 committed by EvilSeph
parent fed863049d
commit 71b0510f88
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -346,7 +346,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override @Override
public boolean teleport(Location location, PlayerTeleportEvent.TeleportCause cause) { public boolean teleport(Location location, PlayerTeleportEvent.TeleportCause cause) {
EntityPlayer entity = getHandle(); EntityPlayer entity = getHandle();
if (entity.netServerHandler == null || entity.netServerHandler.disconnected) return false;
if (entity.netServerHandler == null || entity.netServerHandler.disconnected) {
return false;
}
if (entity.vehicle != null || entity.passenger != null) {
return false;
}
// From = Players current Location // From = Players current Location
Location from = this.getLocation(); Location from = this.getLocation();
@ -355,10 +362,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Create & Call the Teleport Event. // Create & Call the Teleport Event.
PlayerTeleportEvent event = new PlayerTeleportEvent((Player) this, from, to, cause); PlayerTeleportEvent event = new PlayerTeleportEvent((Player) this, from, to, cause);
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
// Return False to inform the Plugin that the Teleport was unsuccessful/cancelled. // Return False to inform the Plugin that the Teleport was unsuccessful/cancelled.
if (event.isCancelled() == true) { if (event.isCancelled()) {
return false; return false;
} }
// Update the From Location // Update the From Location
from = event.getFrom(); from = event.getFrom();
// Grab the new To Location dependent on whether the event was cancelled. // Grab the new To Location dependent on whether the event was cancelled.