From cdd0bb43763323d96ce44394a94409929fa553b9 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 10 Aug 2019 12:44:57 -0500 Subject: [PATCH] Update upstream CB/S --- work/CraftBukkit Submodule work/CraftBukkit 1ec1b05e..368f4e99: > Increase outdated build delay to 3 weeks > SPIGOT-5249: Do not add data to empty loot table > SPIGOT-5257: Call EntityBreedEvent for foxes and set the child's spawn reason to BREEDING --- work/Spigot Submodule work/Spigot e5b1b5db..ea7e48b3: > Add string default for view distance, and API to retrieve per world --- ...in-client-crashes-server-lists-and-Mojang.patch | 14 +++++++------- .../0168-Fix-this-stupid-bullshit.patch | 6 +++--- ...87-Restore-vanlla-default-mob-spawn-range.patch | 6 +++--- .../0380-Async-Chunk-placeholder.patch | 8 ++++---- work/CraftBukkit | 2 +- work/Spigot | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 04c9d3c7c..6d22af972 100644 --- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -1,4 +1,4 @@ -From 6ef37bf7c16af47d5f1f2e0f99d5a3243593ed28 Mon Sep 17 00:00:00 2001 +From 081cf8b1dbc585e75685cf8223bb04a9944bdb38 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index 3f35a28ba1..cf00f35a5b 100644 +index 3f35a28b..cf00f35a 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -70,7 +70,7 @@ public class EULA { @@ -19,7 +19,7 @@ index 3f35a28ba1..cf00f35a5b 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bc0e483a2a..d7c0006605 100644 +index bc0e483a..d7c00066 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1301,7 +1301,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 6 Aug 2017 17:17:53 -0500 Subject: [PATCH] Fix this stupid bullshit @@ -9,12 +9,12 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa and to provide some level of hint without being disruptive. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d2bdd7c73f..1fa81904d4 100644 +index 6e08bf80..460c447d 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -217,10 +217,12 @@ public class Main { Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -7); + deadline.add(Calendar.DAY_OF_YEAR, -21); if (buildDate.before(deadline.getTime())) { - System.err.println("*** Error, this build is outdated ***"); + // Paper start - This is some stupid bullshit diff --git a/Spigot-Server-Patches/0287-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0287-Restore-vanlla-default-mob-spawn-range.patch index ab9301f55..05d7f7ea5 100644 --- a/Spigot-Server-Patches/0287-Restore-vanlla-default-mob-spawn-range.patch +++ b/Spigot-Server-Patches/0287-Restore-vanlla-default-mob-spawn-range.patch @@ -1,14 +1,14 @@ -From 69e4fd0a779bc9bdc0220fe993b9ac7e01ee56b6 Mon Sep 17 00:00:00 2001 +From a72924bfa010ce50f8a5a40414decbe42c15d22e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Aug 2018 12:43:16 -0400 Subject: [PATCH] Restore vanlla default mob-spawn-range diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 2551339031..b3afb901a9 100644 +index 8c7dd013..4feea10d 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -158,7 +158,7 @@ public class SpigotWorldConfig +@@ -165,7 +165,7 @@ public class SpigotWorldConfig public byte mobSpawnRange; private void mobSpawnRange() { diff --git a/Spigot-Server-Patches/0380-Async-Chunk-placeholder.patch b/Spigot-Server-Patches/0380-Async-Chunk-placeholder.patch index 03a63ff36..1301f2888 100644 --- a/Spigot-Server-Patches/0380-Async-Chunk-placeholder.patch +++ b/Spigot-Server-Patches/0380-Async-Chunk-placeholder.patch @@ -1,4 +1,4 @@ -From f1a649c2b246c717099b5764f92d2545f8e1f4ba Mon Sep 17 00:00:00 2001 +From c483347dde3241d7cb904e22a3fdd7bc3637381a Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 May 2019 12:29:24 -0700 Subject: [PATCH] Async Chunk placeholder @@ -6,7 +6,7 @@ Subject: [PATCH] Async Chunk placeholder Until we figure out Mojang's ticket system. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0d4e38d0f4..74f7b046ac 100644 +index 5984e70c..4822687f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -18,6 +18,7 @@ import java.util.Objects; @@ -56,8 +56,8 @@ index 0d4e38d0f4..74f7b046ac 100644 + // Paper end + // Spigot start - private final Spigot spigot = new Spigot() - { + @Override + public int getViewDistance() { -- 2.22.0 diff --git a/work/CraftBukkit b/work/CraftBukkit index 1ec1b05e2..368f4e994 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 1ec1b05e2a808326e9acbfcc3ffbdbdb4d4328c7 +Subproject commit 368f4e994069cf418f5c874f9101fc8804ee4aa9 diff --git a/work/Spigot b/work/Spigot index e5b1b5dbb..ea7e48b3e 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit e5b1b5dbb1c8546af20b21db92bd07a0029d4030 +Subproject commit ea7e48b3e6d973551afe440a8cbc6d96a49d10fc