From 56afbe3f715f827739246b1d489a2f564dca578a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 25 Jul 2015 18:00:37 -0500 Subject: [PATCH] Rebuild --- .../0013-Toggle-for-player-interact-limiter.patch | 8 ++++---- Spigot-Server-Patches/0049-Stackable-Buckets.patch | 10 +++++----- .../0068-Add-PlayerMicroMoveEvent.patch | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Spigot-Server-Patches/0013-Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/0013-Toggle-for-player-interact-limiter.patch index 5fa2c51ade..280f230f46 100644 --- a/Spigot-Server-Patches/0013-Toggle-for-player-interact-limiter.patch +++ b/Spigot-Server-Patches/0013-Toggle-for-player-interact-limiter.patch @@ -1,14 +1,14 @@ -From 4793f39be57f4440a7346ef536a1eaffe51ab9b7 Mon Sep 17 00:00:00 2001 +From de755644734c4d38a0f6994b0c14bff2983216b6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 7 Mar 2015 21:07:10 -0600 Subject: [PATCH] Toggle for player interact limiter diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b639293..56cd3c9 100644 +index 68358e9..7ea74c0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -660,7 +660,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -661,7 +661,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.u()); WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); boolean throttled = false; @@ -38,5 +38,5 @@ index ae3d107..ae410b6 100644 + } } -- -1.9.5.msysgit.1 +2.4.5.windows.1 diff --git a/Spigot-Server-Patches/0049-Stackable-Buckets.patch b/Spigot-Server-Patches/0049-Stackable-Buckets.patch index c99decec34..6038bbfc0b 100644 --- a/Spigot-Server-Patches/0049-Stackable-Buckets.patch +++ b/Spigot-Server-Patches/0049-Stackable-Buckets.patch @@ -1,4 +1,4 @@ -From 848b736b0398bc45d2454cbb4eec473a4a0bafcf Mon Sep 17 00:00:00 2001 +From 7f6d67f412bdc91a8f27531601123d4b9164fdfc Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 1 Jun 2015 22:21:52 -0700 Subject: [PATCH] Stackable Buckets @@ -65,10 +65,10 @@ index 91ea70d..8e3d77e 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 56cd3c9..67c7e5d 100644 +index 7ea74c0..18d8d2d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -61,6 +61,8 @@ import org.bukkit.inventory.InventoryView; +@@ -62,6 +62,8 @@ import org.bukkit.inventory.InventoryView; import org.bukkit.util.NumberConversions; // CraftBukkit end @@ -77,7 +77,7 @@ index 56cd3c9..67c7e5d 100644 public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerListBox { private static final Logger c = LogManager.getLogger(); -@@ -1629,6 +1631,19 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1634,6 +1636,19 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList case ALLOW: case DEFAULT: itemstack = this.player.activeContainer.clickItem(packetplayinwindowclick.b(), packetplayinwindowclick.c(), packetplayinwindowclick.f(), this.player); @@ -170,5 +170,5 @@ index ab21bbf..aba8f87 100644 + } } -- -1.9.5.msysgit.1 +2.4.5.windows.1 diff --git a/Spigot-Server-Patches/0068-Add-PlayerMicroMoveEvent.patch b/Spigot-Server-Patches/0068-Add-PlayerMicroMoveEvent.patch index 5a3564c86e..b18a7953ef 100644 --- a/Spigot-Server-Patches/0068-Add-PlayerMicroMoveEvent.patch +++ b/Spigot-Server-Patches/0068-Add-PlayerMicroMoveEvent.patch @@ -1,14 +1,14 @@ -From c43de820b2e0a4656f0286bbad15c20296c594a2 Mon Sep 17 00:00:00 2001 +From 8b0fe684b14defdd3f55914bcbcc0502ac3ae95a Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 23 Jul 2015 04:29:22 -0700 Subject: [PATCH] Add PlayerMicroMoveEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8c87c31..4902635 100644 +index 18d8d2d..47a54a0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -62,6 +62,7 @@ import org.bukkit.util.NumberConversions; +@@ -63,6 +63,7 @@ import org.bukkit.util.NumberConversions; // CraftBukkit end import org.github.paperspigot.PaperSpigotConfig; // PaperSpigot @@ -16,7 +16,7 @@ index 8c87c31..4902635 100644 public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerListBox { -@@ -257,7 +258,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -258,7 +259,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList double delta = Math.pow(this.lastPosX - to.getX(), 2) + Math.pow(this.lastPosY - to.getY(), 2) + Math.pow(this.lastPosZ - to.getZ(), 2); float deltaAngle = Math.abs(this.lastYaw - to.getYaw()) + Math.abs(this.lastPitch - to.getPitch()); @@ -25,7 +25,7 @@ index 8c87c31..4902635 100644 this.lastPosX = to.getX(); this.lastPosY = to.getY(); this.lastPosZ = to.getZ(); -@@ -267,7 +268,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -268,7 +269,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList // Skip the first time we do this if (true) { // Spigot - don't skip any move events Location oldTo = to.clone(); @@ -35,5 +35,5 @@ index 8c87c31..4902635 100644 // If the event is cancelled we move the player back to their old location. -- -1.9.5.msysgit.1 +2.4.5.windows.1