Update upstream B/CB/S

This commit is contained in:
Zach Brown
2018-10-27 00:02:22 -04:00
parent 090b025ed3
commit f29440f891
57 changed files with 221 additions and 227 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 673f1a3eb..51cf0bfe8 100644
index e83b2ac7..7c700cc2 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -23,6 +23,6 @@ index 673f1a3eb..51cf0bfe8 100644
+ // Paper end
+
/**
* Gets the unique name of this world
*
* Returns a list of entities within a bounding box centered around a
* Location.
--