From 3591fb7ed930e20d7cde342719b38fe637921adf Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 22:20:34 -0500 Subject: [PATCH] Update upstream Spigot and rebuild --- Spigot-API-Patches/0001-POM-changes.patch | 11 +++++------ Spigot-Server-Patches/0005-Timings-v2.patch | 18 +++++++++--------- .../0042-Disable-thunder.patch | 8 ++++---- .../0043-Disable-ice-and-snow.patch | 8 ++++---- ...ble-spawn-chances-for-skeleton-horses.patch | 6 +++--- ...isable-BlockPhysicsEvent-for-Redstone.patch | 8 ++++---- work/Spigot | 2 +- 7 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 161fcc223c..817cfc4b6c 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,23 +1,22 @@ -From 2f32c9ef89437d0047ea741fbc4bade6ae94003a Mon Sep 17 00:00:00 2001 +From 135639c58de544b629f9c8c929160eee1325ef56 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 17:16:08 -0600 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 662379f..a03865f 100644 +index 6304f14..a03865f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,35 +4,37 @@ 4.0.0 -- org.sonatype.oss -- oss-parent -- 9 +- org.spigotmc +- spigot-parent + com.destroystokyo.paper + paper-parent -+ dev-SNAPSHOT + dev-SNAPSHOT - org.spigotmc diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch index 5be9ffbda6..8ad2939ca0 100644 --- a/Spigot-Server-Patches/0005-Timings-v2.patch +++ b/Spigot-Server-Patches/0005-Timings-v2.patch @@ -1,4 +1,4 @@ -From 9580aa6af9b38fb50192c06791f859b4a1a12759 Mon Sep 17 00:00:00 2001 +From f0cccb930c97f03205579dba1faf032ed9969b0a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -345,7 +345,7 @@ index 2983756..9e84616 100644 public void recalcPosition() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index bdfbf56..e6f59da 100644 +index 09d6bd5..81525ee 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -25,7 +25,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -651,7 +651,7 @@ index f38b256..9c67687 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index aaa738a..8b90615 100644 +index 7bf6480..433ed2a 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -244,13 +244,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -672,7 +672,7 @@ index aaa738a..8b90615 100644 this.methodProfiler.c("chunkMap"); timings.doChunkMap.startTiming(); // Spigot this.manager.flush(); -@@ -480,7 +480,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -481,7 +481,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { } } @@ -681,7 +681,7 @@ index aaa738a..8b90615 100644 if (i > 0) { ChunkSection[] achunksection = chunk.getSections(); int i1 = achunksection.length; -@@ -508,6 +508,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -509,6 +509,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { } } } @@ -689,7 +689,7 @@ index aaa738a..8b90615 100644 } this.methodProfiler.b(); -@@ -703,6 +704,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -704,6 +705,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { this.methodProfiler.a("cleaning"); @@ -697,7 +697,7 @@ index aaa738a..8b90615 100644 NextTickListEntry nextticklistentry; for (int j = 0; j < i; ++j) { -@@ -716,9 +718,11 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -717,9 +719,11 @@ public class WorldServer extends World implements IAsyncTaskHandler { // this.nextTickListHash.remove(nextticklistentry); this.U.add(nextticklistentry); } @@ -709,7 +709,7 @@ index aaa738a..8b90615 100644 Iterator iterator = this.U.iterator(); while (iterator.hasNext()) { -@@ -728,6 +732,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -729,6 +733,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (this.areChunksLoadedBetween(nextticklistentry.a.a(-b0, -b0, -b0), nextticklistentry.a.a(b0, b0, b0))) { IBlockData iblockdata = this.getType(nextticklistentry.a); @@ -718,7 +718,7 @@ index aaa738a..8b90615 100644 if (iblockdata.getMaterial() != Material.AIR && Block.a(iblockdata.getBlock(), nextticklistentry.a())) { try { -@@ -740,10 +746,12 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -741,10 +747,12 @@ public class WorldServer extends World implements IAsyncTaskHandler { throw new ReportedException(crashreport); } } diff --git a/Spigot-Server-Patches/0042-Disable-thunder.patch b/Spigot-Server-Patches/0042-Disable-thunder.patch index 006a4e1fca..68a2d04cfe 100644 --- a/Spigot-Server-Patches/0042-Disable-thunder.patch +++ b/Spigot-Server-Patches/0042-Disable-thunder.patch @@ -1,4 +1,4 @@ -From 923f3d8ea4be870cbea8dbc9f3d868b766969bdf Mon Sep 17 00:00:00 2001 +From be317dc17fede314dc8eb7272dad275a5d1bffd8 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:52:43 -0600 Subject: [PATCH] Disable thunder @@ -19,10 +19,10 @@ index 2626f81..1a341d8 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 8b90615..94b5c37 100644 +index 433ed2a..1a615e5 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -420,7 +420,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -421,7 +421,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { int l; BlockPosition blockposition; @@ -33,5 +33,5 @@ index 8b90615..94b5c37 100644 l = this.l >> 2; blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15))); -- -2.7.4 +2.8.0 diff --git a/Spigot-Server-Patches/0043-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0043-Disable-ice-and-snow.patch index 063d36e42e..71e7a56033 100644 --- a/Spigot-Server-Patches/0043-Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/0043-Disable-ice-and-snow.patch @@ -1,4 +1,4 @@ -From 8b3dce7e7e4fcb9a778f027e15d1f22ba86ccfa9 Mon Sep 17 00:00:00 2001 +From 83193b8f541bf99bcd90315d922aba757d865f34 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:57:24 -0600 Subject: [PATCH] Disable ice and snow @@ -19,10 +19,10 @@ index 1a341d8..d8bc932 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 94b5c37..47dbea8 100644 +index 1a615e5..c5b08f9 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -444,7 +444,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -445,7 +445,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { } this.methodProfiler.c("iceandsnow"); @@ -32,5 +32,5 @@ index 94b5c37..47dbea8 100644 l = this.l >> 2; blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15))); -- -2.7.4 +2.8.0 diff --git a/Spigot-Server-Patches/0103-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0103-Configurable-spawn-chances-for-skeleton-horses.patch index 248604c144..66ef8516d3 100644 --- a/Spigot-Server-Patches/0103-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0103-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,4 +1,4 @@ -From 7514fb16d9d7af9eced7dcf8a700bf4300c45bf4 Mon Sep 17 00:00:00 2001 +From c9189373d0a6be8feecbbf1ce54c9ba3c893d538 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses @@ -19,10 +19,10 @@ index 26c1b72..55b211e 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index df7a807..3d25fd4 100644 +index c5b08f9..7239f99 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -428,7 +428,10 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -429,7 +429,10 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (this.isRainingAt(blockposition)) { DifficultyDamageScaler difficultydamagescaler = this.D(blockposition); diff --git a/Spigot-Server-Patches/0110-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0110-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch index ac31a0a4fd..75d9222ce7 100644 --- a/Spigot-Server-Patches/0110-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch +++ b/Spigot-Server-Patches/0110-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch @@ -1,4 +1,4 @@ -From de54050b13b340287834e5e72b96a2c8e7834117 Mon Sep 17 00:00:00 2001 +From 829bedbf8efb98c9a5054e47ac1214d3fdf2cdc7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone @@ -38,7 +38,7 @@ index 6c4a0aa..4bfeb01 100644 this.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3d25fd4..e31bb65 100644 +index 7239f99..acfcb59 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -32,6 +32,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; @@ -49,7 +49,7 @@ index 3d25fd4..e31bb65 100644 private final MinecraftServer server; public EntityTracker tracker; private final PlayerChunkMap manager; -@@ -741,6 +742,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -742,6 +743,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (iblockdata.getMaterial() != Material.AIR && Block.a(iblockdata.getBlock(), nextticklistentry.a())) { try { @@ -57,7 +57,7 @@ index 3d25fd4..e31bb65 100644 iblockdata.getBlock().b((World) this, nextticklistentry.a, iblockdata, this.random); } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Exception while ticking a block"); -@@ -748,7 +750,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -749,7 +751,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { CrashReportSystemDetails.a(crashreportsystemdetails, nextticklistentry.a, iblockdata); throw new ReportedException(crashreport); diff --git a/work/Spigot b/work/Spigot index 5a403651d2..f972b368da 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 5a403651d2b6da681d7aba14e3b1df8171fc5249 +Subproject commit f972b368da8f4aa32dea47c27c5ac428b37f70d3