Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
9a7ca3db Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-03-26 11:07:53 -05:00
parent d4e8659c65
commit 8e455eb2cf
11 changed files with 54 additions and 53 deletions

View File

@@ -1,4 +1,4 @@
From 2eb8ed62d0984187ba4614e4b106ca5e689732da Mon Sep 17 00:00:00 2001
From 81f98328efd0a673f6c9e07e454e604859c44258 Mon Sep 17 00:00:00 2001
From: chase <chasewhip20@gmail.com>
Date: Sun, 15 Mar 2020 18:32:22 -0600
Subject: [PATCH] Per World Spawn limits
@@ -31,10 +31,10 @@ index 629fbca11c..88b704b50b 100644
public boolean batRidableInWater = false;
public boolean batRequireShiftToMount = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 561931f639..2960c94d0c 100644
index 0dafa7666f..5410a416af 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -325,6 +325,13 @@ public class CraftWorld implements World {
@@ -329,6 +329,13 @@ public class CraftWorld implements World {
this.generator = gen;
environment = env;