Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
9205b75c Updated Upstream (CraftBukkit)
c32f8e13 PlayerDeathEvent#shouldDropExperience
05ecc314 Updated Upstream (CraftBukkit)
f8fd607e Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-12-23 22:17:27 -06:00
parent 074110faf7
commit ca55ab06f0
9 changed files with 55 additions and 55 deletions

View File

@@ -1,4 +1,4 @@
From 478fa240814a1fe4f68df47ab07c1a8fc1e9c525 Mon Sep 17 00:00:00 2001
From 4b57bf6cf59f6995211ea71b7993a6a2f8e492ef 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 05389f5bbe..60405821b6 100644
index be37281d5..128a18f71 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2400,6 +2400,11 @@ public class CraftWorld implements World {
@@ -2408,6 +2408,11 @@ public class CraftWorld implements World {
public void setFluidTickEventEnabled(boolean enabled) {
getHandle().purpurConfig.fluidTickEvent = enabled;
}
@@ -24,5 +24,5 @@ index 05389f5bbe..60405821b6 100644
// Paper start
--
2.24.0.rc1
2.24.0