Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
ad708dd3 Add option to allow iron golems to spawn in air (Closes #1965, Closes #1851)
b16fd5c3 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-03-10 19:30:18 -05:00
parent a9305232b2
commit f2e328d295
53 changed files with 486 additions and 530 deletions

View File

@@ -1,4 +1,4 @@
From 706905bb67539f5dc51111a9688c60a90e97244e Mon Sep 17 00:00:00 2001
From f5e5f66187d41368f78a3d3e57615d41f6ac4fc5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 1 Feb 2020 22:22:16 -0600
Subject: [PATCH] Add moon phase API
@@ -8,10 +8,10 @@ Subject: [PATCH] Add moon phase API
1 file changed, 7 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7aed24c8f..a1df723f5 100644
index 339ec053c7..e873d77db2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2414,6 +2414,13 @@ public class CraftWorld implements World {
@@ -2434,6 +2434,13 @@ public class CraftWorld implements World {
return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
}