Update upstream

This commit is contained in:
Aikar
2018-07-25 19:05:07 -04:00
parent 10ed7dc6b4
commit 8536a71daa
49 changed files with 148 additions and 148 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index e8290759bb..0f4a894ebb 100644
index 23f0d5cb7d..54a605f9b9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -0,0 +0,0 @@ public class CraftWorld implements World {