Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
7e8ae207 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-07-11 21:45:34 -05:00
parent 02e31ae620
commit abd93908c7
5 changed files with 14 additions and 14 deletions

View File

@@ -1,4 +1,4 @@
From 8272f3bf685efcdfa39f21e05ccfeac8560144d2 Mon Sep 17 00:00:00 2001
From da238cff8dd0f47ebd11b15dbfbd36fbecf25fe4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 23:23:45 -0500
Subject: [PATCH] Block and Fluid Tick Events
@@ -13,7 +13,7 @@ Subject: [PATCH] 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 00000000..e467052a
index 000000000..e467052a0
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java
@@ -0,0 +1,52 @@
@@ -71,7 +71,7 @@ index 00000000..e467052a
+}
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 00000000..9cd1e3dd
index 000000000..9cd1e3dde
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java
@@ -0,0 +1,52 @@
@@ -128,10 +128,10 @@ index 00000000..9cd1e3dd
+ }
+}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 65dc8022..c99e4291 100644
index 1e7b633c1..8794160e6 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2811,6 +2811,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2900,6 +2900,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);