testserver/CraftBukkit-Patches/0041-Don-t-Special-Case-X-M...

50 lines
2.4 KiB
Diff
Raw Normal View History

2016-02-29 21:33:06 +00:00
From f5f87701e5a6ab0f80580fb892c7f5c52ee40e06 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2016-02-29 21:33:06 +00:00
index f785d9f..83a4551 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2016-02-29 21:33:06 +00:00
@@ -124,6 +124,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
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();
2016-02-29 21:33:06 +00:00
@@ -324,6 +325,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
2015-05-22 13:52:56 +00:00
// CraftBukkit start - fire PlayerMoveEvent
Player player = this.getPlayer();
+ // Spigot Start
+ if ( !hasMoved )
+ {
+ Location curPos = player.getLocation();
+ 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.
2016-02-29 21:33:06 +00:00
@@ -349,7 +362,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
2015-05-22 13:52:56 +00:00
this.lastPitch = to.getPitch();
2015-05-22 13:52:56 +00:00
// 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.server.getPluginManager().callEvent(event);
--
2016-02-29 21:33:06 +00:00
2.5.0