Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
f6f9157b Don't toString block unless actually showing the message
b3f0527a Add Spawn Entity SpawnReason API
ec8d7387 MC-183249: Don't generate Carving Masks BitSet unless needed
2d401d2d Improve BlockPosition hashCode/equals
2572bd01 Fix world unload toLowercase - Fixes #3326
dda9680b Optimize brigadier child sorting performance
a71a4ec2 Fix CraftServer.unloadWorld Leak
This commit is contained in:
William Blake Galbreath
2020-05-09 13:18:38 -05:00
parent 3ce3644645
commit 833bd1cc47
9 changed files with 28 additions and 28 deletions

View File

@@ -1,4 +1,4 @@
From f7117483a092158d2028933b04c54d53a637b7b8 Mon Sep 17 00:00:00 2001
From 8876f5bd26cacef6a6849fb2c95a5118742c40d3 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 00000000..f5ad98c6
index 000000000..f5ad98c62
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/MoonPhase.java
@@ -0,0 +1,36 @@
@@ -52,10 +52,10 @@ index 00000000..f5ad98c6
+ }
+}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 421ad6a9..a9a274a9 100644
index 906ee6827..e5232946e 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3244,6 +3244,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3273,6 +3273,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public List<Raid> getRaids();

View File

@@ -1,4 +1,4 @@
From bf422cd39e795cf7b12b77774a4c5ff1208ec819 Mon Sep 17 00:00:00 2001
From 386834e8745191fe5fc0436a6c50a5abeaf588b6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:34:36 -0500
Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
1 file changed, 10 insertions(+)
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index a9a274a9..d67d4355 100644
index e5232946e..822e06647 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3252,6 +3252,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3281,6 +3281,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
@NotNull
net.pl3x.purpur.MoonPhase getMoonPhase();