mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
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:
@@ -1,4 +1,4 @@
|
||||
From 21773eb994120e80f72be1ed9d0a51523149b022 Mon Sep 17 00:00:00 2001
|
||||
From 0a5979ad09792249e6c4b56860bbcf45cb5b9634 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 1 Feb 2020 22:22:07 -0600
|
||||
Subject: [PATCH] Add moon phase API
|
||||
@@ -11,7 +11,7 @@ Subject: [PATCH] Add moon phase API
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/MoonPhase.java b/src/main/java/net/pl3x/purpur/MoonPhase.java
|
||||
new file mode 100644
|
||||
index 000000000..f5ad98c62
|
||||
index 00000000..f5ad98c6
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/pl3x/purpur/MoonPhase.java
|
||||
@@ -0,0 +1,36 @@
|
||||
@@ -52,10 +52,10 @@ index 000000000..f5ad98c62
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index d9df7509a..d8178abfc 100644
|
||||
index a3ed3154..01d7204b 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -3145,6 +3145,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -3243,6 +3243,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@NotNull
|
||||
public List<Raid> getRaids();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user