From d3dc24999e0a1e8f3e8d9d59a36f32261a52a498 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 16 Jan 2021 02:18:08 +0000 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 85b16b8a Update to Minecraft 1.16.5 CraftBukkit Changes: f3f30947 Update to Minecraft 1.16.5 Spigot Changes: 018b9a0d Update to Minecraft 1.16.5 --- Paper-MojangAPI/pom.xml | 2 +- Spigot-API-Patches/0001-POM-changes.patch | 4 +- .../0022-Use-ASM-for-event-executors.patch | 8 ++-- ...low-plugins-to-use-SLF4J-for-logging.patch | 4 +- Spigot-Server-Patches/0001-POM-Changes.patch | 34 +++++++++-------- ...012-Configurable-fishing-time-ranges.patch | 4 +- ...oleAppender-for-console-improvements.patch | 12 +++--- ...n-prefixes-using-Log4J-configuration.patch | 4 +- ...-Include-Log4J2-SLF4J-implementation.patch | 4 +- ...239-Use-asynchronous-Log4j-2-loggers.patch | 8 ++-- .../0355-Implement-CraftBlockSoundGroup.patch | 38 +++++-------------- .../0428-Increase-Light-Queue-Size.patch | 4 +- .../0465-Implement-Mob-Goal-API.patch | 4 +- ...ld-Difficulty-Remembering-Difficulty.patch | 14 +++---- ...ng-a-passenger-in-CreatureSpawnEvent.patch | 8 ++-- work/BuildData | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 19 files changed, 71 insertions(+), 89 deletions(-) diff --git a/Paper-MojangAPI/pom.xml b/Paper-MojangAPI/pom.xml index 7075a42db1..7712a8723c 100644 --- a/Paper-MojangAPI/pom.xml +++ b/Paper-MojangAPI/pom.xml @@ -10,7 +10,7 @@ com.destroystokyo.paper paper-mojangapi - 1.16.4-R0.1-SNAPSHOT + 1.16.5-R0.1-SNAPSHOT jar Paper-MojangAPI diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index ebce1d96a4..023149518c 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index e096e95e4e21ce4e4b4b08301f3b5948242bf00d..db8ebc72f9ddfb33a3aa3d2e0366ef4f6f324567 100644 +index 6b1cebc7fb6760a44359d81b029c4d8843125e49..ed19c62e5a2dbc7e660eae61aef21295afdb8aaf 100644 --- a/pom.xml +++ b/pom.xml @@ -2,34 +2,28 @@ @@ -22,7 +22,7 @@ index e096e95e4e21ce4e4b4b08301f3b5948242bf00d..db8ebc72f9ddfb33a3aa3d2e0366ef4f - spigot-api + com.destroystokyo.paper + paper-api - 1.16.4-R0.1-SNAPSHOT + 1.16.5-R0.1-SNAPSHOT jar - Spigot-API diff --git a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch index e4bb28108a..b69c18ab03 100644 --- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch @@ -6,23 +6,23 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index 30253c7c0da5c5940fab16df0f118e1b167712e8..01263d58c48324131b8feb20404174e1d40754a5 100644 +index 58fc279186e01a4703102227f387e96272fcf0a7..e040e0e37276295a0b7404357679e80fbbb618a3 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,17 @@ - 8.0.1 + 9.0 test + + + org.ow2.asm + asm -+ 8.0.1 ++ 9.0 + + + org.ow2.asm + asm-commons -+ 8.0.1 ++ 9.0 + diff --git a/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch index a740228cd1..e81c853587 100644 --- a/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,11 +14,11 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index 01263d58c48324131b8feb20404174e1d40754a5..1c33b1f4d2366116dd45478b8ad9cdb51fd6bb57 100644 +index e040e0e37276295a0b7404357679e80fbbb618a3..7747189d49727eea039f3994e186b34480025144 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,13 @@ - 19.0.0 + 20.1.0 provided + diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index a7baabfd0f..1b317c19ed 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e56fe310b 100644 +index a9d4c697fd52614cff7f035b5e9c7c52c925065b..301bee0db7b1118b2a6588c7ecfa9a6be5e1cd93 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ @@ -16,7 +16,7 @@ index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e - spigot + paper jar - 1.16.4-R0.1-SNAPSHOT + 1.16.5-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ + Paper @@ -27,8 +27,8 @@ index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e + UTF-8 unknown - 1.16.4 -@@ -19,21 +18,27 @@ + git +@@ -20,21 +19,27 @@ @@ -61,8 +61,8 @@ index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e minecraft-server ${minecraft.version}-SNAPSHOT compile -@@ -56,6 +61,17 @@ - 8.0.1 +@@ -64,6 +69,17 @@ + 9.0 compile + @@ -79,7 +79,7 @@ index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e com.googlecode.json-simple -@@ -112,34 +128,22 @@ +@@ -120,34 +136,22 @@ @@ -101,7 +101,7 @@ index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e - ex-spigot - -- git-Spigot-%s +- ${bt.name}-Spigot-%s - ../ - spigot.desc - @@ -125,7 +125,7 @@ index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e -@@ -149,6 +153,7 @@ +@@ -157,6 +161,7 @@ maven-jar-plugin 3.2.0 @@ -133,7 +133,7 @@ index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e false -@@ -156,8 +161,9 @@ +@@ -164,8 +169,9 @@ org.bukkit.craftbukkit.Main CraftBukkit @@ -145,7 +145,7 @@ index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e Bukkit ${api.version} Bukkit Team -@@ -196,6 +202,7 @@ +@@ -204,14 +210,23 @@ shade @@ -153,7 +153,9 @@ index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e ${shadeSourcesJar} -@@ -204,6 +211,14 @@ +- org.spigotmc:minecraft-server ++ io.papermc:minecraft-server + com/google/common/** com/google/gson/** com/google/thirdparty/** @@ -168,7 +170,7 @@ index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e -@@ -219,10 +234,11 @@ +@@ -227,10 +242,11 @@ jline org.bukkit.craftbukkit.libs.jline @@ -184,7 +186,7 @@ index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e org.apache.commons.codec org.bukkit.craftbukkit.libs.org.apache.commons.codec -@@ -264,10 +280,6 @@ +@@ -272,10 +288,6 @@ org.apache.maven.plugins maven-compiler-plugin 3.8.1 @@ -196,13 +198,13 @@ index df982b5d1675f768017b06a899ea84237706b539..6490e605b560cda01489983be498868e diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 9a26aa7807271fcaaa3a596d6861a05b6717ead2..2fc61b25c9553480814283ec0858d017c1d8b7e5 100644 +index 60ede7442b2d9a63fcd765aff29a96c9130aebac..3f52c19b6b797e26b3dcedcec2afd28c478e7091 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -186,7 +186,7 @@ public class Main { } - if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { + if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { - Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L); + Date buildDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper diff --git a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch index f9572ed362..376e4d630c 100644 --- a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch @@ -22,13 +22,13 @@ index 796c17e0941922a9716212c6eae91643d8360418..78948c42b13194005bdbbbc69c2b7ae0 + } } diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 7c152768afcb6259984120d97205601d74e15148..9db1c891b69d4fbe163b3272f22351f3d0b306d1 100644 +index 96e5246b6e6f285f3c1029147a6566f00b576a27..ad2ec3472a164bdf3a1ff2c42ec18c74ad58a13c 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -46,6 +46,10 @@ public class EntityFishingHook extends IProjectile { entityhuman.hookedFish = this; this.an = Math.max(0, i); - this.ao = Math.max(0, j); + this.lureLevel = Math.max(0, j); + // Paper start + minWaitTime = world.paperConfig.fishingMinTicks; + maxWaitTime = world.paperConfig.fishingMaxTicks; diff --git a/Spigot-Server-Patches/0145-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0145-Use-TerminalConsoleAppender-for-console-improvements.patch index 741f66478a..e7ea76d393 100644 --- a/Spigot-Server-Patches/0145-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0145-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -19,10 +19,10 @@ Other changes: configuration diff --git a/pom.xml b/pom.xml -index 6490e605b560cda01489983be498868e56fe310b..fa902057491114bd7e919982c0970dd019d9e643 100644 +index 301bee0db7b1118b2a6588c7ecfa9a6be5e1cd93..0a6e1782c0eb8aa3aff94c5bfae5c5ea4a24ba56 100644 --- a/pom.xml +++ b/pom.xml -@@ -44,10 +44,27 @@ +@@ -45,10 +45,27 @@ compile @@ -54,7 +54,7 @@ index 6490e605b560cda01489983be498868e56fe310b..fa902057491114bd7e919982c0970dd0 org.apache.logging.log4j -@@ -271,10 +288,18 @@ +@@ -279,10 +296,18 @@ META-INF/services/java.sql.Driver @@ -186,7 +186,7 @@ index dc0cb79525adf0d5afee1f677e1fde546529cf97..750b1dc10ffb7adb9194e6cc8ace8fa9 System.setOut(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream()); System.setErr(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream()); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 836fdfcedb6b878c69bfa22cbbe1fc10a25d8ad0..b14381fd33b19a511106046d0c66d58353c57e7d 100644 +index c6b520f3f8872a0345f76a75f0b48fe113021716..ee009052eb10125bbaca95b5fda306adbd8a9995 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -58,7 +58,7 @@ import org.apache.logging.log4j.LogManager; @@ -286,7 +286,7 @@ index 60d5de863b3abf364e0895d1b83c836b75e1e2be..921434d9adf0b2c55c1194a3f258ffad @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index c4bd353a53bf620644492d2629ab0ab07cb267c2..1c4c72800550806fd3daddc94cd0cb7a23e897e4 100644 +index 78b6d00ea40e8d7c450e08e444c5231e7c99969b..78fad8d06540a0cf41302f12bf25e08e49f589d9 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -12,7 +12,7 @@ import java.util.logging.Level; @@ -325,7 +325,7 @@ index c4bd353a53bf620644492d2629ab0ab07cb267c2..1c4c72800550806fd3daddc94cd0cb7a + System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper } - if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { + if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { @@ -226,7 +237,7 @@ public class Main { System.out.println("Unable to read system info"); } diff --git a/Spigot-Server-Patches/0166-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0166-Handle-plugin-prefixes-using-Log4J-configuration.patch index f6eccb6e53..06e8980f46 100644 --- a/Spigot-Server-Patches/0166-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/0166-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -15,10 +15,10 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/pom.xml b/pom.xml -index 7c775cb6b51be98e2a257a5e2774e23f35e46369..50379bfe731eb9538f365275c04a764b02944633 100644 +index 0a6e1782c0eb8aa3aff94c5bfae5c5ea4a24ba56..14d365756efbe2067c049659eb9076ab1e3415ef 100644 --- a/pom.xml +++ b/pom.xml -@@ -64,7 +64,7 @@ +@@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core 2.8.1 diff --git a/Spigot-Server-Patches/0167-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0167-Include-Log4J2-SLF4J-implementation.patch index 83894fec09..9500e57913 100644 --- a/Spigot-Server-Patches/0167-Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/0167-Include-Log4J2-SLF4J-implementation.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Include Log4J2 SLF4J implementation diff --git a/pom.xml b/pom.xml -index 50379bfe731eb9538f365275c04a764b02944633..0c7a485ae7c2fbb5aa4c892d75a314a75056ba9a 100644 +index 14d365756efbe2067c049659eb9076ab1e3415ef..a58e4aa63164aa6ae4e7ecf87ea9c46c73fcb8f4 100644 --- a/pom.xml +++ b/pom.xml -@@ -66,6 +66,12 @@ +@@ -67,6 +67,12 @@ 2.8.1 compile diff --git a/Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch index 58aaa9e723..8a00415117 100644 --- a/Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch +++ b/Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers diff --git a/pom.xml b/pom.xml -index 0c7a485ae7c2fbb5aa4c892d75a314a75056ba9a..2349491a15393a450d80397dd92c5733b28a3482 100644 +index a58e4aa63164aa6ae4e7ecf87ea9c46c73fcb8f4..ba6e70eb472bda9d0cf51c3b69a5bd41fc24c399 100644 --- a/pom.xml +++ b/pom.xml -@@ -78,6 +78,13 @@ - 2.8.1 - compile +@@ -86,6 +86,13 @@ + + + + diff --git a/Spigot-Server-Patches/0355-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0355-Implement-CraftBlockSoundGroup.patch index b06130f325..092db9526e 100644 --- a/Spigot-Server-Patches/0355-Implement-CraftBlockSoundGroup.patch +++ b/Spigot-Server-Patches/0355-Implement-CraftBlockSoundGroup.patch @@ -49,40 +49,22 @@ index 0000000000000000000000000000000000000000..8183c94ff4883e1af02e82098f1f80cf + } +} diff --git a/src/main/java/net/minecraft/server/SoundEffectType.java b/src/main/java/net/minecraft/server/SoundEffectType.java -index 5ed0cddfe6357031644e9e59e6674aa1505ddd8c..e9ea2d04c10d5866f6e5c262e518ec63f0911d94 100644 +index 49093a5294d5e64ac149e6922e884e72f9f56c03..5f5153ec781c73d76bbf0b5b14b45bf4b74faefd 100644 --- a/src/main/java/net/minecraft/server/SoundEffectType.java +++ b/src/main/java/net/minecraft/server/SoundEffectType.java @@ -51,10 +51,10 @@ public class SoundEffectType { public static final SoundEffectType U = new SoundEffectType(1.0F, 1.0F, SoundEffects.BLOCK_GILDED_BLACKSTONE_BREAK, SoundEffects.BLOCK_GILDED_BLACKSTONE_STEP, SoundEffects.BLOCK_GILDED_BLACKSTONE_PLACE, SoundEffects.BLOCK_GILDED_BLACKSTONE_HIT, SoundEffects.BLOCK_GILDED_BLACKSTONE_FALL); - public final float V; - public final float W; -- public final SoundEffect X; // PAIL private -> public, rename breakSound -+ public final SoundEffect X; public final SoundEffect getBreakSound() { return this.X; } // Paper - OBFHELPER // PAIL private -> public, rename breakSound - private final SoundEffect Y; - private final SoundEffect Z; -- public final SoundEffect aa; // PAIL private -> public, rename hitSound -+ public final SoundEffect aa; public final SoundEffect getHitSound() { return this.aa; } // Paper - OBFHELPER // PAIL private -> public, rename hitSound - private final SoundEffect ab; + public final float volume; + public final float pitch; +- public final SoundEffect breakSound; ++ public final SoundEffect breakSound; public final SoundEffect getBreakSound() { return this.breakSound; } // Paper - OBFHELPER // PAIL private -> public, rename breakSound + private final SoundEffect stepSound; + private final SoundEffect placeSound; +- public final SoundEffect hitSound; ++ public final SoundEffect hitSound; public final SoundEffect getHitSound() { return this.hitSound; } // Paper - OBFHELPER // PAIL private -> public, rename hitSound + private final SoundEffect fallSound; public SoundEffectType(float f, float f1, SoundEffect soundeffect, SoundEffect soundeffect1, SoundEffect soundeffect2, SoundEffect soundeffect3, SoundEffect soundeffect4) { -@@ -75,14 +75,17 @@ public class SoundEffectType { - return this.W; - } - -+ public final SoundEffect getStepSound() { return this.d(); } // Paper - OBFHELPER - public SoundEffect d() { - return this.Y; - } - -+ public final SoundEffect getPlaceSound() { return this.e(); } // Paper - OBFHELPER - public SoundEffect e() { - return this.Z; - } - -+ public final SoundEffect getFallSound() { return this.g(); } // Paper - OBFHELPER - public SoundEffect g() { - return this.ab; - } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java index 661bb54c27966c8050644b293d99dfe86e3c04ce..41bd71a55626b933c948e5c7e7b8af534eb896c4 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java diff --git a/Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch index ed296eb4ce..3c534ed854 100644 --- a/Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch +++ b/Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch @@ -28,7 +28,7 @@ index 6c8e9d498c9a30a1aa88494ba09c3cae012a8fa1..cd248eb6be663e8be33f2c3c6b06b77b + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f5120de89959d6f4df94bfd37657f390e9892f55..1647c36c2b8f81be59ed48eb329977331aa709b1 100644 +index 272f05ac46f9fc2d430f70535a7a44cebea2dbda..96a784744110e7dd4939eb2c1b57346a2d60f983 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -655,7 +655,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant1.3 test diff --git a/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index c7674414e9..a39648beba 100644 --- a/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -39,7 +39,7 @@ index f5792b999ce42acb13ae9a62ceb2ddec39abe209..5504facd2e453238caa71d98743be541 @Override diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 319740c0256a6ad2544b4997c835235e4d3a4a9a..820c680f1039f747797a758cece5014f3159e508 100644 +index d0ce4b96174f85c545a457fe864c7ebadc727ade..ca417825eb0827caad817f65b5132f1de37e3679 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1524,11 +1524,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant cp() { -- return Stream.concat(Stream.of(this), this.passengers.stream().flatMap(Entity::cp)); -+ return Stream.concat(Stream.of(this), com.google.common.collect.ImmutableList.copyOf(this.passengers).stream().flatMap(Entity::cp)); // Paper + public Stream recursiveStream() { +- return Stream.concat(Stream.of(this), this.passengers.stream().flatMap(Entity::recursiveStream)); ++ return Stream.concat(Stream.of(this), com.google.common.collect.ImmutableList.copyOf(this.passengers).stream().flatMap(Entity::recursiveStream)); // Paper } public boolean hasSinglePlayerPassenger() { diff --git a/work/BuildData b/work/BuildData index 501ea06074..656df5e622 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit 501ea060743c7bba4436878207e4f1232298efce +Subproject commit 656df5e622bba97efb4e858e8cd3ec428a0b2d71 diff --git a/work/Bukkit b/work/Bukkit index 0958895aef..85b16b8a5f 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 0958895aefcccb79abb4d703d5a8694af7416e4a +Subproject commit 85b16b8a5f044eb8d38375c23e8968641d18a933 diff --git a/work/CraftBukkit b/work/CraftBukkit index 7a6c3c9aa6..f3f30947e0 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 7a6c3c9aa6e48de164aeeb78052a7775f3f81c30 +Subproject commit f3f30947e07c4ea07dcbf41129c2ca830a73fd4d diff --git a/work/Spigot b/work/Spigot index a93cbb1e98..018b9a0d5a 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit a93cbb1e986c59ffd888f072490db0afe4119093 +Subproject commit 018b9a0d5a7a03eeabe2b2d7d74bca56db2e9949