Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-03 09:19:38 +01:00
Code Issues Projects Releases Wiki Activity

Rebuild patches

Browse Source
This commit is contained in:
Zach Brown 2015-07-20 20:14:39 -05:00
parent 4d70f421f6
commit 58a75fef88
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0013-Toggle-for-player-interact-limiter.patch
View File

@ -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 <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 7 Mar 2015 21:07:10 -0600 Date: Sat, 7 Mar 2015 21:07:10 -0600
Subject: [PATCH] Toggle for player interact limiter 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 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 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/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()); PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.u());
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
boolean throttled = false; boolean throttled = false;
@ -19,7 +19,7 @@ index ccb21ed..2428935 100644
} else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 ) } 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 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 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
@@ -154,4 +154,14 @@ public class PaperSpigotConfig @@ -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

8
Spigot-Server-Patches/0049-Stackable-Buckets.patch
View File

@ -1,4 +1,4 @@
From f1bb897a8ebdacde081f58eae9d3db7e93587bc8 Mon Sep 17 00:00:00 2001 From 99dee886e5e0645312ed534a7220bfe7f55607a8 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Mon, 1 Jun 2015 22:21:52 -0700 Date: Mon, 1 Jun 2015 22:21:52 -0700
Subject: [PATCH] Stackable Buckets 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 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 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/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; @@ -61,6 +61,8 @@ import org.bukkit.inventory.InventoryView;
@ -77,7 +77,7 @@ index 9b97e2c..4fd432b 100644
public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerListBox { public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerListBox {
private static final Logger c = LogManager.getLogger(); 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 ALLOW:
case DEFAULT: case DEFAULT:
itemstack = this.player.activeContainer.clickItem(packetplayinwindowclick.b(), packetplayinwindowclick.c(), packetplayinwindowclick.f(), this.player); 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