Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a6ac47e5 Fix numerous item duplication issues and teleport issues
b7402f11 Add phantom creative and insomniac controls (#3222)
75819fac Fix Potion#toItemStack swapping the extended and upgraded constructor values (#3216)
This commit is contained in:
William Blake Galbreath
2020-04-25 15:48:09 -05:00
parent 6daa61aea9
commit 8ec7d99ec0
108 changed files with 642 additions and 746 deletions

View File

@@ -0,0 +1,31 @@
From 2817799d1f627d5209ed009920b175fe7342fdae 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 | 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 f56131e3a..de8c2cd2b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2457,6 +2457,14 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}
+
+ // Purpur start
+ @Override
+ public net.pl3x.purpur.MoonPhase getMoonPhase() {
+ return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
+ }
+ // Purpur end
+
// Paper start
@Override
public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) {
--
2.24.0