diff --git a/Paper b/Paper index b0b54e4ef..a8ef0a93b 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit b0b54e4ef351f86f0fd856b664328a023908e234 +Subproject commit a8ef0a93b9f41c49adab0e9183303db8a79812b9 diff --git a/current-paper b/current-paper index 04c7b04db..0aa5ce063 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--3b0e4b2f45a0c069c407b56f24d9f04b5cad032a +1.15.2--f3c7076de22e62cc37044558163e341613072819 diff --git a/patches/api/0030-Add-ItemStack-convenience-methods.patch b/patches/api/0030-Add-ItemStack-convenience-methods.patch index 3dc77c412..6646f7a45 100644 --- a/patches/api/0030-Add-ItemStack-convenience-methods.patch +++ b/patches/api/0030-Add-ItemStack-convenience-methods.patch @@ -1,4 +1,4 @@ -From c7218d4100f7de38fbfc643e4705908adf1c41bd Mon Sep 17 00:00:00 2001 +From da8df9256caea27c4fc9e9298878e1d1428fe6a1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 15 Mar 2020 20:52:12 -0500 Subject: [PATCH] Add ItemStack convenience methods @@ -9,10 +9,10 @@ Subject: [PATCH] Add ItemStack convenience methods 2 files changed, 651 insertions(+) diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 1f2dbd68c..f2be0d0ce 100644 +index b89fc2dc0..d5cf01dae 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -7995,4 +7995,36 @@ public enum Material implements Keyed { +@@ -8021,4 +8021,36 @@ public enum Material implements Keyed { // } } diff --git a/patches/server/0103-Optimize-Chunk-Ticks.patch b/patches/server/0103-Optimize-Chunk-Ticks.patch index fb1a3c33a..835fb3181 100644 --- a/patches/server/0103-Optimize-Chunk-Ticks.patch +++ b/patches/server/0103-Optimize-Chunk-Ticks.patch @@ -1,4 +1,4 @@ -From a75f52ba9053f7276ad8e6a950381c9c2e35f7d8 Mon Sep 17 00:00:00 2001 +From a86a2da2c5932ea73094f9e8612250867ae7b89c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Apr 2020 00:28:06 -0500 Subject: [PATCH] Optimize Chunk Ticks @@ -9,10 +9,10 @@ Subject: [PATCH] Optimize Chunk Ticks 2 files changed, 25 insertions(+), 39 deletions(-) diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 1209fbf1c9..0ebd2f8799 100644 +index 54e89c9cc6..9af2c5c747 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -782,11 +782,12 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -781,11 +781,12 @@ public class ChunkProviderServer extends IChunkProvider { int k = this.world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED); BlockPosition blockposition = this.world.getSpawn(); // CraftBukkit start - Other mob type spawn tick rate @@ -30,7 +30,7 @@ index 1209fbf1c9..0ebd2f8799 100644 // CraftBukkit end this.world.getMethodProfiler().enter("naturalSpawnCount"); -@@ -833,40 +834,11 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -831,40 +832,11 @@ public class ChunkProviderServer extends IChunkProvider { if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(playerchunk, chunkcoordintpair, true)) { // Spigot // Paper - optimise isOutsideOfRange this.world.getMethodProfiler().enter("spawner"); this.world.timings.mobSpawn.startTiming(); // Spigot diff --git a/patches/server/0122-Tuinity-Delay-chunk-unloads.patch b/patches/server/0122-Tuinity-Delay-chunk-unloads.patch index 7858fcc4a..aca35e84e 100644 --- a/patches/server/0122-Tuinity-Delay-chunk-unloads.patch +++ b/patches/server/0122-Tuinity-Delay-chunk-unloads.patch @@ -1,4 +1,4 @@ -From d2c2b464f6e94a3c3904e410164da9c97e9dde84 Mon Sep 17 00:00:00 2001 +From 0676e1e882ad34b6ea8cd6fc7455919c2d34ccc9 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 25 Oct 2019 02:11:30 -0700 Subject: [PATCH] Tuinity - Delay chunk unloads @@ -23,7 +23,7 @@ Configurable under `delay-chunkunloads-by` in config. 6 files changed, 82 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java -index 55f9f4e6e..ac21fdb4c 100644 +index 55f9f4e6e7..ac21fdb4c9 100644 --- a/src/main/java/net/minecraft/server/ChunkMap.java +++ b/src/main/java/net/minecraft/server/ChunkMap.java @@ -68,6 +68,7 @@ public abstract class ChunkMap extends LightEngineGraph { @@ -35,7 +35,7 @@ index 55f9f4e6e..ac21fdb4c 100644 this.a(ChunkCoordIntPair.a, i, j, flag); } diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 771d87971..6d46ca591 100644 +index 9805361e2d..3ad0177d2a 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -31,7 +31,7 @@ public abstract class ChunkMapDistance { @@ -134,7 +134,7 @@ index 771d87971..6d46ca591 100644 private static int a(ArraySetSorted> arraysetsorted) { AsyncCatcher.catchOp("ChunkMapDistance::getHighestTicketLevel"); // Paper return !arraysetsorted.isEmpty() ? ((Ticket) arraysetsorted.b()).b() : PlayerChunkMap.GOLDEN_TICKET + 1; -@@ -175,6 +234,11 @@ public abstract class ChunkMapDistance { +@@ -182,6 +241,11 @@ public abstract class ChunkMapDistance { boolean removed = false; // CraftBukkit if (arraysetsorted.remove(ticket)) { removed = true; // CraftBukkit @@ -147,7 +147,7 @@ index 771d87971..6d46ca591 100644 if (arraysetsorted.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java -index 0d6e0f2dd..ce0aef25c 100644 +index 0d6e0f2dda..ce0aef25c6 100644 --- a/src/main/java/net/minecraft/server/Ticket.java +++ b/src/main/java/net/minecraft/server/Ticket.java @@ -5,9 +5,10 @@ import java.util.Objects; @@ -172,7 +172,7 @@ index 0d6e0f2dd..ce0aef25c 100644 long j = this.a.b(); diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java -index 24ec5d77c..1243134bc 100644 +index 24ec5d77ca..1243134bc2 100644 --- a/src/main/java/net/minecraft/server/TicketType.java +++ b/src/main/java/net/minecraft/server/TicketType.java @@ -25,6 +25,7 @@ public class TicketType { @@ -184,7 +184,7 @@ index 24ec5d77c..1243134bc 100644 public static TicketType a(String s, Comparator comparator) { return new TicketType<>(s, comparator, 0L); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index ab88636ca..becb13e0e 100644 +index ab88636cad..becb13e0e0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -4,6 +4,7 @@ import com.google.common.base.Throwables; @@ -209,7 +209,7 @@ index ab88636ca..becb13e0e 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 066b07f5a..067272cf3 100644 +index cc1fb7108a..159c7673d5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -488,6 +488,7 @@ public class CraftWorld implements World {