Updated Upstream (Bukkit/CraftBukkit)

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: e461dcfe #555: Item - add getters/setters for owner/thrower CraftBukkit Changes: 055870c4 #758: Item - add getters/setters for owner/thrower
2020-10-14 16:00:43 +02:00 · 2020-10-14 16:00:43 +02:00 · 74f507f4e3
commit 74f507f4e3
parent ffe68e8875
326 changed files with 47 additions and 158 deletions
--- a/Spigot-API-Patches/0218-Add-moon-phase-API.patch
+++ b/Spigot-API-Patches/0218-Add-moon-phase-API.patch
@ -0,0 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Sun, 23 Aug 2020 16:32:03 +0200
+Subject: [PATCH] Add moon phase API
+
+
+diff --git a/src/main/java/io/papermc/paper/world/MoonPhase.java b/src/main/java/io/papermc/paper/world/MoonPhase.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..df05153397b42930cd53d37b30824c7e5f008f7e
+--- /dev/null
+++ b/src/main/java/io/papermc/paper/world/MoonPhase.java
+@@ -0,0 +1,36 @@
+package io.papermc.paper.world;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum MoonPhase {
+    FULL_MOON(0L),
+    WANING_GIBBOUS(1L),
+    LAST_QUARTER(2L),
+    WANING_CRESCENT(3L),
+    NEW_MOON(4L),
+    WAXING_CRESCENT(5L),
+    FIRST_QUARTER(6L),
+    WAXING_GIBBOUS(7L);
+
+    private final long day;
+
+    MoonPhase(long day) {
+        this.day = day;
+    }
+
+    private static final Map<Long, MoonPhase> BY_DAY = new HashMap<>();
+
+    static {
+        for (MoonPhase phase : values()) {
+            BY_DAY.put(phase.day, phase);
+        }
+    }
+
+    @NotNull
+    public static MoonPhase getPhase(long day) {
+        return BY_DAY.get(day % 8L);
+    }
+}
+diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
+index ba5e6cca028df293a939db37ecf5857059554291..e827e1a6f5c0f8410ed32dda8f17aa769b469999 100644
+--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
+@@ -70,6 +70,12 @@ public interface World extends PluginMessageRecipient, Metadatable {
+      * @return The amount of Players in this world
+      */
+     int getPlayerCount();
+
+    /**
+     * @return the current moon phase at the current time in the world
+     */
+    @NotNull
+    io.papermc.paper.world.MoonPhase getMoonPhase();
+     // Paper end
+ 
+     /**