Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
94b8708a SPIGOT-4373: Item display colours are white by default
61668436 SPIGOT-4378: Fix mistakenly included code
This commit is contained in:
Aikar
2018-09-15 19:13:40 -04:00
parent fe975151cb
commit 067d7e4f86
10 changed files with 18 additions and 18 deletions

View File

@@ -42,7 +42,7 @@ index e8af8f4196..56c3783412 100644
// CraftBukkit start
org.bukkit.Server server = this.world.getServer();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e2ed2d3c1f..2b7ab82b11 100644
index 527cf942c8..c565e46226 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc