Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
9a7ca3db Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-03-26 11:07:53 -05:00
parent d4e8659c65
commit 8e455eb2cf
11 changed files with 54 additions and 53 deletions

View File

@@ -1,4 +1,4 @@
From 53db874caac91ef3a2ccd51af5d1c0e10097aa6a Mon Sep 17 00:00:00 2001
From dcf5faf511f1cdbfbbbf318a2e50cb159881aeae Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 8 Feb 2020 23:30:17 -0600
Subject: [PATCH] Add getPlacementBlockData to World
@@ -66,10 +66,10 @@ index 9c9b93f280..74a722cce5 100644
public static final Item bZ = a(Blocks.CHEST, CreativeModeTab.c);
public static final Item ca = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index e873d77db2..0659bc1df0 100644
index a49b3469a3..56033969f9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2439,6 +2439,11 @@ public class CraftWorld implements World {
@@ -2453,6 +2453,11 @@ public class CraftWorld implements World {
public net.pl3x.purpur.MoonPhase getMoonPhase() {
return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
}