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
This commit is contained in:
Zach Brown
2019-08-10 12:44:57 -05:00
parent 1740293b68
commit 825b92807a
6 changed files with 14 additions and 14 deletions

View File

@@ -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
@@ -0,0 +0,0 @@ import java.util.Objects;
@@ -56,6 +56,6 @@ index 0d4e38d0f4..74f7b046ac 100644
+ // Paper end
+
// Spigot start
private final Spigot spigot = new Spigot()
{
@Override
public int getViewDistance() {
--