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: f09fed89 Update upstream B/CB 7c1ef0b7 Add option to ignore the java version check in CB 510dfd60 [CI-SKIP] Update build badge in README to use proper job
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From afac0359f02085127ab36121d871e8685a39de85 Mon Sep 17 00:00:00 2001
|
||||
From 08f61132cb4349e6e64d37f4bd67fb233ede48f7 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 5a28b8bed..887598ff7 100644
|
||||
index 07e0f604..7566d701 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -3096,6 +3096,14 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -3155,6 +3155,14 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
*/
|
||||
@NotNull
|
||||
BlockData getPlacementBlockData(@NotNull BlockData blockData, @NotNull Location location);
|
||||
|
||||
Reference in New Issue
Block a user