From d2c503e68a3c791f07cb2c3160ceea3a70b8d11b Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Fri, 28 Nov 2014 18:06:26 -0600 Subject: [PATCH] Update Spigot's Patches round 2? The hell happened here. : Fix Build 2339ac14a8e Regen the patches 89d3fcbdfaf This new system breaks a lot :( --- .gitignore | 2 -- Bukkit | 1 + CraftBukkit | 1 + .../0045-Don-t-Special-Case-X-Move-Value.patch | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) create mode 160000 Bukkit create mode 160000 CraftBukkit diff --git a/.gitignore b/.gitignore index 952f896233..c101ffb154 100644 --- a/.gitignore +++ b/.gitignore @@ -40,5 +40,3 @@ Spigot-API Spigot-Server PaperSpigot-Server PaperSpigot-API -Bukkit -CraftBukkit diff --git a/Bukkit b/Bukkit new file mode 160000 index 0000000000..277baff1a1 --- /dev/null +++ b/Bukkit @@ -0,0 +1 @@ +Subproject commit 277baff1a14c0eb57ef723d625446698a857884e diff --git a/CraftBukkit b/CraftBukkit new file mode 160000 index 0000000000..8fc4c83218 --- /dev/null +++ b/CraftBukkit @@ -0,0 +1 @@ +Subproject commit 8fc4c8321883ec02a43185e494404d1ba2079d3e diff --git a/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch index c03c6d16dc..fd04dc505d 100644 --- a/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch +++ b/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch @@ -14,8 +14,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private boolean justTeleported = false; + private boolean hasMoved; // Spigot - // For the PacketPlayOutBlockPlace hack :( - Long lastPacket; + public CraftPlayer getPlayer() { + return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity(); @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } // CraftBukkit start - fire PlayerMoveEvent