Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 20:46:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:Dinnerbone/Craftbukkit

Browse Source
This commit is contained in:
Dinnerbone 2010-12-29 00:29:31 +00:00
commit 36b95edc0c
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/net/minecraft/server/EntityPlayerMP.java
View File

@ -62,23 +62,24 @@ public class EntityPlayerMP extends EntityPlayer
}
/**
* Craftbukkit: Overloaded version of b(double,double,double,float)
* Craftbukkit: Overloaded version of b(double,double,double,float, float)
*
* Enables monitoring of PLAYER_MOVE events.
*/
public void b(double x, double y, double z, float rotation, float pitch) {
super.b(x,y,z,pitch,rotation);
// Only send an event if player position has changed.
if (x == oldLocation.getX() && y == oldLocation.getY() && z == oldLocation.getZ())
return;
Location newLocation = new Location(server.getWorld(b.e),x,y,z);
PlayerMoveEvent pm = new PlayerMoveEvent(Event.Type.PLAYER_MOVE, server.getPlayer(this),
oldLocation, newLocation);
server.getPluginManager().callEvent(pm);
// Only send an event if player position has changed.
if (x != oldLocation.getX() || y != oldLocation.getY() || z != oldLocation.getZ()) {
PlayerMoveEvent pm = new PlayerMoveEvent(Event.Type.PLAYER_MOVE, server.getPlayer(this),
oldLocation, newLocation);
server.getPluginManager().callEvent(pm);
if (pm.isCancelled())
newLocation = pm.getFrom();
}
oldLocation = newLocation;
super.b(newLocation.getX(),newLocation.getY(),newLocation.getZ(),rotation, pitch);
}
public void k() {