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,20 +1,21 @@
From f5e5f66187d41368f78a3d3e57615d41f6ac4fc5 Mon Sep 17 00:00:00 2001
From 458fd315ee6aec1a13dd76ae82f0520a1307c09e 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
---
src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 7 +++++++
1 file changed, 7 insertions(+)
src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 339ec053c7..e873d77db2 100644
index 4db397d9f9..a49b3469a3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2434,6 +2434,13 @@ public class CraftWorld implements World {
return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
}
@@ -2447,6 +2447,14 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}
+
+ // Purpur start
+ @Override
+ public net.pl3x.purpur.MoonPhase getMoonPhase() {