From 58a75fef88e22ede2a4aa5fd9493444bd2768b86 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 20 Jul 2015 20:14:39 -0500 Subject: [PATCH] Rebuild patches --- .../0013-Toggle-for-player-interact-limiter.patch | 10 +++++----- Spigot-Server-Patches/0049-Stackable-Buckets.patch | 8 ++++---- 2 files changed, 9 insertions(+), 9 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 4ada37456a..a1bab93853 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 0b7018f9f835891c600dded64e187dc642d3b719 Mon Sep 17 00:00:00 2001 +From 53adc0879fee781bd8d18878205950fb525ed4bb 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 ccb21ed..2428935 100644 +index a6d8b96..52247c0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -638,7 +638,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -652,7 +652,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; @@ -19,7 +19,7 @@ index ccb21ed..2428935 100644 } else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 ) { diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index c583a80..0cd121b 100644 +index ae3d107..ae410b6 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java @@ -154,4 +154,14 @@ public class PaperSpigotConfig @@ -38,5 +38,5 @@ index c583a80..0cd121b 100644 + } } -- -2.4.1.windows.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 4b082d0d58..837a1dff84 100644 --- a/Spigot-Server-Patches/0049-Stackable-Buckets.patch +++ b/Spigot-Server-Patches/0049-Stackable-Buckets.patch @@ -1,4 +1,4 @@ -From f1bb897a8ebdacde081f58eae9d3db7e93587bc8 Mon Sep 17 00:00:00 2001 +From 99dee886e5e0645312ed534a7220bfe7f55607a8 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 1 Jun 2015 22:21:52 -0700 Subject: [PATCH] Stackable Buckets @@ -65,7 +65,7 @@ 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 9b97e2c..4fd432b 100644 +index 52247c0..2c373cd 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; @@ -77,7 +77,7 @@ index 9b97e2c..4fd432b 100644 public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerListBox { private static final Logger c = LogManager.getLogger(); -@@ -1607,6 +1609,19 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1621,6 +1623,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