From 1a6e813bcfe3866e440ca1fd8a9a5686cb06552d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 6 Oct 2013 17:36:28 +1100 Subject: [PATCH] Don't Special Case X Move Value diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java index 6b98e086e..acee766ee 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -282,6 +282,7 @@ public class PlayerConnection implements ServerPlayerConnection, PacketListenerP private float lastPitch = Float.MAX_VALUE; private float lastYaw = Float.MAX_VALUE; private boolean justTeleported = false; + private boolean hasMoved; // Spigot public CraftPlayer getPlayer() { return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity(); @@ -548,6 +549,7 @@ public class PlayerConnection implements ServerPlayerConnection, PacketListenerP flag1 = true; PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", entity.getDisplayName().getString(), this.player.getDisplayName().getString(), Math.sqrt(d10)); } + Location curPos = this.getPlayer().getLocation(); // Spigot entity.setLocation(d3, d4, d5, f, f1); player.setLocation(d3, d4, d5, this.player.getYRot(), this.player.getXRot()); // CraftBukkit @@ -562,6 +564,17 @@ public class PlayerConnection implements ServerPlayerConnection, PacketListenerP // CraftBukkit start - fire PlayerMoveEvent Player player = this.getPlayer(); + // Spigot Start + if ( !hasMoved ) + { + lastPosX = curPos.getX(); + lastPosY = curPos.getY(); + lastPosZ = curPos.getZ(); + lastYaw = curPos.getYaw(); + lastPitch = curPos.getPitch(); + hasMoved = true; + } + // Spigot End Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location. Location to = player.getLocation().clone(); // Start off the To location as the Players current location. @@ -587,7 +600,7 @@ public class PlayerConnection implements ServerPlayerConnection, PacketListenerP this.lastPitch = to.getPitch(); // Skip the first time we do this - if (from.getX() != Double.MAX_VALUE) { + if (true) { // Spigot - don't skip any move events Location oldTo = to.clone(); PlayerMoveEvent event = new PlayerMoveEvent(player, from, to); this.cserver.getPluginManager().callEvent(event); -- 2.25.1