Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
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:
William Blake Galbreath
2020-02-08 20:14:57 -06:00
parent cd602cef9a
commit e52e23265f
11 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0018-Add-block-and-fluid-tick-events.patch
View File

@@ -1,4 +1,4 @@
From a826a72e5296e80f2858925861cbe089f149fe29 Mon Sep 17 00:00:00 2001
From 5c6ebf213cb5ff0c16fb1c8f2e7721b666873ae7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 23:58:29 -0500
Subject: [PATCH] Add block and fluid tick events
@@ -13,7 +13,7 @@ Subject: [PATCH] Add block and fluid tick events
diff --git a/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java b/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java
new file mode 100644
index 000000000..02787304f
index 00000000..02787304
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java
@@ -0,0 +1,55 @@
@@ -74,7 +74,7 @@ index 000000000..02787304f
+}
diff --git a/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java b/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java
new file mode 100644
index 000000000..1a8f0b674
index 00000000..1a8f0b67
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java
@@ -0,0 +1,55 @@
@@ -134,10 +134,10 @@ index 000000000..1a8f0b674
+ }
+}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 6fe025338..1edf1ec72 100644
index 5047be15..c12d0efc 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3058,6 +3058,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3117,6 +3117,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public List<Raid> getRaids();

6
patches/api/0020-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From 211fe2b9508d8cbdd4b1d9a38e0b7c98e7d37745 Mon Sep 17 00:00:00 2001
From 0961dfd2209679bbd2bf0f76de5a6c77bfca7eb1 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 1edf1ec72..5a28b8bed 100644
index c12d0efc..07e0f604 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3086,6 +3086,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3145,6 +3145,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param enabled True to enable
*/
void setFluidTickEventEnabled(boolean enabled);

8
patches/api/0030-Add-moon-phase-API.patch
View File

@@ -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);