Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appears 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:
6148fca7 SPIGOT-5484: Add more spawn tick settings

CraftBukkit Changes:
fc249340 SPIGOT-5484: Add more spawn tick settings

Spigot Changes:
6de3d4be Rebuild patches
This commit is contained in:
Shane Freeder
2020-03-10 11:01:15 +00:00
parent 2e44dc1ae3
commit b16fd5c3a3
72 changed files with 421 additions and 421 deletions

View File

@@ -1,14 +1,14 @@
From 6598e3cc8934ed6cbcef393823b7e872f75e2ffc Mon Sep 17 00:00:00 2001
From 764f34aa28a16bfcdf60719d2b7ee38bdff3be33 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 1 Jan 2019 02:22:01 -0800
Subject: [PATCH] Add Heightmap API
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b506f5871..406e5c60a 100644
index 4aca398f1..20d9dd839 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -567,8 +567,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -571,8 +571,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
}
@@ -20,7 +20,7 @@ index b506f5871..406e5c60a 100644
if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 323d78b22..27602824a 100644
index b41404652..d4ccef12f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -335,6 +335,29 @@ public class CraftWorld implements World {