Upstream merge, nothing major.

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-21 19:13:39 +11:00
parent c14cb5a15b
commit 2c6428f4b1
13 changed files with 39 additions and 324 deletions

View File

@@ -1,14 +1,14 @@
From 9012deaaf0fe945dba34bbcdc8f720d76aa89c94 Mon Sep 17 00:00:00 2001
From 093e002fed03cfc3e4b51441d197a4467eca5d39 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
index c38d48a..ff91fd3 100644
index 6e54ad1..e88adfa 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -103,6 +103,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -105,6 +105,7 @@ public class PlayerConnection implements PacketPlayInListener {
private float lastPitch = Float.MAX_VALUE;
private float lastYaw = Float.MAX_VALUE;
private boolean justTeleported = false;
@@ -16,7 +16,7 @@ index c38d48a..ff91fd3 100644
// For the PacketPlayOutBlockPlace hack :(
Long lastPacket;
@@ -220,7 +221,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -222,7 +223,7 @@ public class PlayerConnection implements PacketPlayInListener {
this.lastPitch = to.getPitch();
// Skip the first time we do this
@@ -25,7 +25,7 @@ index c38d48a..ff91fd3 100644
PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
this.server.getPluginManager().callEvent(event);
@@ -244,7 +245,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -246,7 +247,7 @@ public class PlayerConnection implements PacketPlayInListener {
this.justTeleported = false;
return;
}