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:
William Blake Galbreath
2020-02-08 20:14:57 -06:00
parent cd602cef9a
commit e52e23265f
11 changed files with 38 additions and 38 deletions

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