OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-11 17:31:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Small cleanup for the last commit

Browse source
This commit is contained in:
Erik Broes 2011-03-23 18:42:36 +01:00
parent 376ac51cea
commit e8e7581446
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/net/minecraft/server/NetServerHandler.java
View file

@ -258,7 +258,11 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
} }
} }
// CraftBukkit start -- Delegate for a(double, double, double, float, float) public void a(double d0, double d1, double d2, float f, float f1) {
// CraftBukkit start -- Delegate to teleport(Location)
teleport(new Location(getPlayer().getWorld(), d0, d1, d2, f, f1));
}
public boolean teleport(Location dest) { public boolean teleport(Location dest) {
// Note: the world in location is used only for the event // Note: the world in location is used only for the event
// Inter-world teleportation is handled in CraftPlayer.teleport() // Inter-world teleportation is handled in CraftPlayer.teleport()
@ -280,26 +284,18 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
d2 = to.getZ(); d2 = to.getZ();
f = to.getYaw(); f = to.getYaw();
f1 = to.getPitch(); f1 = to.getPitch();
// CraftBukkit end
// net.minecraft.server start
this.l = false; this.l = false;
this.i = d0; this.i = d0;
this.j = d1; this.j = d1;
this.k = d2; this.k = d2;
this.e.b(d0, d1, d2, f, f1); this.e.b(d0, d1, d2, f, f1);
this.e.a.b((Packet) (new Packet13PlayerLookMove(d0, d1 + 1.6200000047683716D, d1, d2, f, f1, false))); this.e.a.b((Packet) (new Packet13PlayerLookMove(d0, d1 + 1.6200000047683716D, d1, d2, f, f1, false)));
// net.minecraft.server end
// Returns TRUE if the teleport was successful // CraftBukkit -- Returns TRUE if the teleport was successful
return !event.isCancelled(); return !event.isCancelled();
} }
// CraftBukkit end
public void a(double d0, double d1, double d2, float f, float f1) {
// CraftBukkit start -- Delegate to teleport(Location)
teleport(new Location(getPlayer().getWorld(), d0, d1, d2, f, f1));
// CraftBukkit end
}
public void a(Packet14BlockDig packet14blockdig) { public void a(Packet14BlockDig packet14blockdig) {
if (packet14blockdig.e == 4) { if (packet14blockdig.e == 4) {