diff options
8 files changed, 49 insertions, 43 deletions
diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch index 7484cfc7bb..fdab7ab138 100644 --- a/Spigot-Server-Patches/0005-Timings-v2.patch +++ b/Spigot-Server-Patches/0005-Timings-v2.patch @@ -1,4 +1,4 @@ -From 8b7c2bb5ec55a8468a4da7ec0f7af9045bb1b514 Mon Sep 17 00:00:00 2001 +From a500af740a3d0d36fbcd5e0b3f1558e14d6a7f0d Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -1155,10 +1155,10 @@ index e649435..b73f64e 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0668887..94d07eb 100644 +index 50fad7c..769d55b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -245,13 +245,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -246,13 +246,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { timings.doChunkUnload.stopTiming(); // Spigot this.methodProfiler.c("tickPending"); @@ -1176,7 +1176,7 @@ index 0668887..94d07eb 100644 this.methodProfiler.c("chunkMap"); timings.doChunkMap.startTiming(); // Spigot this.manager.flush(); -@@ -483,7 +483,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -484,7 +484,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { } } @@ -1185,7 +1185,7 @@ index 0668887..94d07eb 100644 if (i > 0) { ChunkSection[] achunksection = chunk.getSections(); int i1 = achunksection.length; -@@ -511,6 +511,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -512,6 +512,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { } } } @@ -1193,7 +1193,7 @@ index 0668887..94d07eb 100644 } this.methodProfiler.b(); -@@ -706,6 +707,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -707,6 +708,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { this.methodProfiler.a("cleaning"); @@ -1201,7 +1201,7 @@ index 0668887..94d07eb 100644 NextTickListEntry nextticklistentry; for (int j = 0; j < i; ++j) { -@@ -719,9 +721,11 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -720,9 +722,11 @@ public class WorldServer extends World implements IAsyncTaskHandler { // this.nextTickListHash.remove(nextticklistentry); this.U.add(nextticklistentry); } @@ -1213,7 +1213,7 @@ index 0668887..94d07eb 100644 Iterator iterator = this.U.iterator(); while (iterator.hasNext()) { -@@ -731,6 +735,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -732,6 +736,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (this.areChunksLoadedBetween(nextticklistentry.a.a(0, 0, 0), nextticklistentry.a.a(0, 0, 0))) { IBlockData iblockdata = this.getType(nextticklistentry.a); @@ -1222,7 +1222,7 @@ index 0668887..94d07eb 100644 if (iblockdata.getMaterial() != Material.AIR && Block.a(iblockdata.getBlock(), nextticklistentry.a())) { try { -@@ -743,10 +749,12 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -744,10 +750,12 @@ public class WorldServer extends World implements IAsyncTaskHandler { throw new ReportedException(crashreport); } } @@ -1235,7 +1235,7 @@ index 0668887..94d07eb 100644 this.methodProfiler.b(); this.U.clear(); -@@ -842,7 +850,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -843,7 +851,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { gen = new org.bukkit.craftbukkit.generator.NormalChunkGenerator(this, this.getSeed()); } @@ -1736,5 +1736,5 @@ index 30efc99..eb30abe 100644 } } -- -2.10.1.windows.1 +2.10.1 diff --git a/Spigot-Server-Patches/0041-Disable-thunder.patch b/Spigot-Server-Patches/0041-Disable-thunder.patch index a21fadf114..3d04272166 100644 --- a/Spigot-Server-Patches/0041-Disable-thunder.patch +++ b/Spigot-Server-Patches/0041-Disable-thunder.patch @@ -1,4 +1,4 @@ -From c5512f2eb68c4789b22668680af20606826726e6 Mon Sep 17 00:00:00 2001 +From e6e691810c2713ab5be6850b337d662a33067458 Mon Sep 17 00:00:00 2001 From: Sudzzy <[email protected]> Date: Wed, 2 Mar 2016 14:52:43 -0600 Subject: [PATCH] Disable thunder @@ -19,10 +19,10 @@ index 87979dd..076fcbb 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 94d07eb..9b5142c 100644 +index 769d55b..5b9e2c1 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -423,7 +423,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -424,7 +424,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { int l; BlockPosition blockposition; @@ -33,5 +33,5 @@ index 94d07eb..9b5142c 100644 l = this.l >> 2; blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15))); -- -2.10.0.windows.1 +2.10.1 diff --git a/Spigot-Server-Patches/0042-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0042-Disable-ice-and-snow.patch index 8992f659db..032e9382b7 100644 --- a/Spigot-Server-Patches/0042-Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/0042-Disable-ice-and-snow.patch @@ -1,4 +1,4 @@ -From 767a9ef7974c8e7f760f8bae8cfcb2c6207e8c71 Mon Sep 17 00:00:00 2001 +From 19fc676defe5633053a5242c6c7ab76f759f6f3b Mon Sep 17 00:00:00 2001 From: Sudzzy <[email protected]> Date: Wed, 2 Mar 2016 14:57:24 -0600 Subject: [PATCH] Disable ice and snow @@ -19,10 +19,10 @@ index 076fcbb..9018df5 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9b5142c..54446aa 100644 +index 5b9e2c1..c2c0b5e 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -447,7 +447,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -448,7 +448,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { } this.methodProfiler.c("iceandsnow"); @@ -32,5 +32,5 @@ index 9b5142c..54446aa 100644 l = this.l >> 2; blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15))); -- -2.10.0.windows.1 +2.10.1 diff --git a/Spigot-Server-Patches/0094-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0094-Configurable-spawn-chances-for-skeleton-horses.patch index 38a8ce313a..c86811953e 100644 --- a/Spigot-Server-Patches/0094-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0094-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,4 +1,4 @@ -From d5594099e7d56ad2c0b61376bd58ad98359c851b Mon Sep 17 00:00:00 2001 +From 6f186d0f6d800dbe7e7626e8794b6e8880ac38a9 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses @@ -22,10 +22,10 @@ index b701e5e..d29f2a4 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 54446aa..db71eef 100644 +index c2c0b5e..170a0ce 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -431,7 +431,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -432,7 +432,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (this.isRainingAt(blockposition)) { DifficultyDamageScaler difficultydamagescaler = this.D(blockposition); @@ -35,5 +35,5 @@ index 54446aa..db71eef 100644 entityhorse.setType(EnumHorseType.SKELETON); -- -2.10.0.windows.1 +2.10.1 diff --git a/Spigot-Server-Patches/0101-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0101-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch index da83051006..b827079b58 100644 --- a/Spigot-Server-Patches/0101-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch +++ b/Spigot-Server-Patches/0101-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch @@ -1,4 +1,4 @@ -From a665617ef7bb355cd7ca3ab6d21f0b136dbaa9ce Mon Sep 17 00:00:00 2001 +From 5a634134cafed1bec53537156945fd424a8536de Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone @@ -38,10 +38,10 @@ index b683c3e..0c7558f 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 db71eef..87abf7f 100644 +index 170a0ce..24b79d3 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -33,6 +33,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; +@@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; public class WorldServer extends World implements IAsyncTaskHandler { private static final Logger a = LogManager.getLogger(); @@ -49,7 +49,7 @@ index db71eef..87abf7f 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 db71eef..87abf7f 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); @@ -67,5 +67,5 @@ index db71eef..87abf7f 100644 timing.stopTiming(); // Paper } else { -- -2.10.0.windows.1 +2.10.1 diff --git a/Spigot-Server-Patches/0171-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0171-Auto-Save-Improvements.patch index 756d0a856c..bfdf965f9d 100644 --- a/Spigot-Server-Patches/0171-Auto-Save-Improvements.patch +++ b/Spigot-Server-Patches/0171-Auto-Save-Improvements.patch @@ -1,4 +1,4 @@ -From edb088fcf6a8ab77306a2007ca7137c52616a656 Mon Sep 17 00:00:00 2001 +From ac5e6492e7395bfff150b85781fe9d0e82ef72a4 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Mon, 19 Sep 2016 23:16:39 -0400 Subject: [PATCH] Auto Save Improvements @@ -119,10 +119,10 @@ index 8ca8fbf..c19bde9 100644 this.methodProfiler.a("tallying"); this.h[this.ticks % 100] = System.nanoTime() - i; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 87abf7f..ed3805d 100644 +index 24b79d3..9e38304 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1016,12 +1016,12 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -1017,12 +1017,12 @@ public class WorldServer extends World implements IAsyncTaskHandler { ChunkProviderServer chunkproviderserver = this.getChunkProviderServer(); if (chunkproviderserver.e()) { @@ -138,5 +138,5 @@ index 87abf7f..ed3805d 100644 iprogressupdate.c("Saving chunks"); } -- -2.10.0 +2.10.1 diff --git a/Spigot-Server-Patches/0177-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0177-Disable-Vanilla-Chunk-GC.patch index 0ac6af69af..ca9069acda 100644 --- a/Spigot-Server-Patches/0177-Disable-Vanilla-Chunk-GC.patch +++ b/Spigot-Server-Patches/0177-Disable-Vanilla-Chunk-GC.patch @@ -1,4 +1,4 @@ -From 0de0dd7bad529706df1d5266a83f8fa7162eda1a Mon Sep 17 00:00:00 2001 +From 115f50ab9b7570f7a78ad397d5bf5fe6fce2840b Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Mon, 26 Sep 2016 01:51:30 -0400 Subject: [PATCH] Disable Vanilla Chunk GC @@ -6,10 +6,10 @@ Subject: [PATCH] Disable Vanilla Chunk GC Bukkit has its own system for this. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ed3805d..a1350b0 100644 +index 9e38304..7c91625 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1028,7 +1028,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -1029,7 +1029,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { chunkproviderserver.a(flag); // CraftBukkit - ArrayList -> Collection @@ -18,7 +18,7 @@ index ed3805d..a1350b0 100644 Iterator iterator = arraylist.iterator(); while (iterator.hasNext()) { -@@ -1037,7 +1037,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -1038,7 +1038,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (chunk != null && !this.manager.a(chunk.locX, chunk.locZ)) { chunkproviderserver.unload(chunk); } @@ -29,5 +29,5 @@ index ed3805d..a1350b0 100644 } } -- -2.10.0 +2.10.1 diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject b5fb9a1cd769a0ee1283c47b5b8b54bbf559c9a +Subproject e20928f7da265577c771b63ca7ce49c35ef19b2 |