Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
bd1e1ad1 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-01-05 19:46:55 -06:00
parent bf9c4f7153
commit c239b1563d
7 changed files with 22 additions and 22 deletions

View File

@@ -1,4 +1,4 @@
From 3f684028d9178608f302ef468f19e4fe89d8cb74 Mon Sep 17 00:00:00 2001
From 086d06c91d3c358f3b7b0603530a5c668f488c76 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
@@ -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 725c9059d..8205b4767 100644
index 579b779aa..d6fd253e5 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3046,6 +3046,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3064,6 +3064,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public List<Raid> getRaids();
@@ -175,5 +175,5 @@ index 725c9059d..8205b4767 100644
* Represents various map environment types that a world may be
*/
--
2.24.0.rc1
2.24.0

View File

@@ -1,4 +1,4 @@
From cf82e3c599dd3c048b0f452ec5209df163028b94 Mon Sep 17 00:00:00 2001
From df13ad308de51c50e411f06f6a7380aff8bae8ec 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 8205b4767..887ac0645 100644
index d6fd253e5..17a45a9b6 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3074,6 +3074,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3092,6 +3092,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param enabled True to enable
*/
void setFluidTickEventEnabled(boolean enabled);
@@ -29,5 +29,5 @@ index 8205b4767..887ac0645 100644
/**
--
2.24.0.rc1
2.24.0