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 2995e429743f1cd97ae7eb189cfe8ebdd4149fcc Mon Sep 17 00:00:00 2001
From 80c9dfe529da583048f1462eb442a48f0f9950ef Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:34:43 -0500
Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
1 file changed, 5 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 5c892a694..9960504d0 100644
index 9a8c5b7f7..776ccdd8e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2409,6 +2409,11 @@ public class CraftWorld implements World {
@@ -2428,6 +2428,11 @@ public class CraftWorld implements World {
public void setFluidTickEventEnabled(boolean enabled) {
getHandle().purpurConfig.fluidTickEvent = enabled;
}