From 46d8cd6ca711c0071aeb7bb69a81e86639d546a6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 7 Mar 2016 00:57:19 -0600 Subject: [PATCH] Rebuild patches --- .../0010-Toggle-for-player-interact-limiter.patch | 6 +++--- .../0023-Add-async-chunk-load-API.patch | 6 +++--- ...allingBlock-and-TNTPrimed-source-location-API.patch | 10 +++++----- Spigot-Server-Patches/0057-Timings-v2.patch | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Spigot-Server-Patches/0010-Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/0010-Toggle-for-player-interact-limiter.patch index 0decdb66c..695d46559 100644 --- a/Spigot-Server-Patches/0010-Toggle-for-player-interact-limiter.patch +++ b/Spigot-Server-Patches/0010-Toggle-for-player-interact-limiter.patch @@ -1,4 +1,4 @@ -From 6a062cb66da8455d5997ade36cfe9ff64dc30ef0 Mon Sep 17 00:00:00 2001 +From 2edd7fbd40e36707d36c148b9cefa8458c9964f7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:31:05 -0600 Subject: [PATCH] Toggle for player interact limiter @@ -22,10 +22,10 @@ index dca7763..0ffa733 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index e711f75..82b81be 100644 +index 99707f0..4795c44 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -876,7 +876,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -904,7 +904,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { this.player.resetIdleTimer(); // Spigot start boolean throttled = false; diff --git a/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch index be7db7cab..6b8878943 100644 --- a/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch +++ b/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch @@ -1,11 +1,11 @@ -From e15513a2c62039f36abc3db23fed7f193bfffc15 Mon Sep 17 00:00:00 2001 +From 1d8176a9fe0d15eaf957171d91fc1dd83b8812ca Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:19:01 -0600 Subject: [PATCH] Add async chunk load API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index c0d7ac5..173f1c5 100644 +index b06f167..fcf5a0e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -121,6 +121,26 @@ public class CraftWorld implements World { @@ -33,7 +33,7 @@ index c0d7ac5..173f1c5 100644 + // Paper end + public Chunk getChunkAt(int x, int z) { - return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk; + return this.world.getChunkProviderServer().getOrCreateChunkFast(x, z).bukkitChunk; } -- 2.7.2 diff --git a/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch b/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch index ea0bbd52c..3f38ec05d 100644 --- a/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch +++ b/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch @@ -1,4 +1,4 @@ -From a0a5b759e8c00ab29b5cdb1302d195e7cc73a5a5 Mon Sep 17 00:00:00 2001 +From 28d69ac776319cd7076c8ccb9ad9ed4bea38bfbb Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] FallingBlock and TNTPrimed source location API @@ -193,10 +193,10 @@ index 564ea37..1820c7b 100644 public EntityLiving getSource() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 19b13e5..187a16b 100644 +index fcf5a0e..6c3f615 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -880,7 +880,10 @@ public class CraftWorld implements World { +@@ -899,7 +899,10 @@ public class CraftWorld implements World { double y = location.getBlockY() + 0.5; double z = location.getBlockZ() + 0.5; @@ -208,7 +208,7 @@ index 19b13e5..187a16b 100644 entity.ticksLived = 1; world.addEntity(entity, SpawnReason.CUSTOM); -@@ -916,7 +919,10 @@ public class CraftWorld implements World { +@@ -935,7 +938,10 @@ public class CraftWorld implements World { int type = CraftMagicNumbers.getId(blockData.getBlock()); int data = blockData.getBlock().toLegacyData(blockData); @@ -220,7 +220,7 @@ index 19b13e5..187a16b 100644 } else if (Projectile.class.isAssignableFrom(clazz)) { if (Snowball.class.isAssignableFrom(clazz)) { entity = new EntitySnowball(world, x, y, z); -@@ -1111,7 +1117,8 @@ public class CraftWorld implements World { +@@ -1130,7 +1136,8 @@ public class CraftWorld implements World { throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location); } } else if (TNTPrimed.class.isAssignableFrom(clazz)) { diff --git a/Spigot-Server-Patches/0057-Timings-v2.patch b/Spigot-Server-Patches/0057-Timings-v2.patch index a0a7363ea..e835ec40a 100644 --- a/Spigot-Server-Patches/0057-Timings-v2.patch +++ b/Spigot-Server-Patches/0057-Timings-v2.patch @@ -1,4 +1,4 @@ -From 69261900d1655e72db8dfd4c586c463a8d09a1f9 Mon Sep 17 00:00:00 2001 +From 8eea819e93e12e8d9be9dd9b17bb2c0bdca54580 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -461,7 +461,7 @@ index 733f8e7..92b98a0 100644 // Run tasks that are waiting on processing SpigotTimings.processQueueTimer.startTiming(); // Spigot diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 82b81be..25d9d85 100644 +index 4795c44..2ebe52b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -472,7 +472,7 @@ index 82b81be..25d9d85 100644 // CraftBukkit end public class PlayerConnection implements PacketListenerPlayIn, ITickable { -@@ -1296,7 +1297,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -1324,7 +1325,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { // CraftBukkit end private void handleCommand(String s) { @@ -481,7 +481,7 @@ index 82b81be..25d9d85 100644 // CraftBukkit start - whole method if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot this.LOGGER.info(this.player.getName() + " issued server command: " + s); -@@ -1307,22 +1308,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -1335,22 +1336,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { this.server.getPluginManager().callEvent(event); if (event.isCancelled()) {