Update upstream B/CB/S

This commit is contained in:
Zach Brown 2018-10-27 00:02:22 -04:00
parent b1ab9ad452
commit c4865a6445
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
57 changed files with 380 additions and 386 deletions

View file

@ -1,14 +1,14 @@
From 9068935d9c8fc8d37ca47ceeef6e752c5ef84ecf Mon Sep 17 00:00:00 2001
From 596f70a064c3481f5197b4b17cd4126e9dd8799a Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 3 Jul 2018 16:07:16 +0200
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
@@ -699,6 +699,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -705,6 +705,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public Collection<Entity> getNearbyEntities(Location location, double x, double y, double z);
@ -23,8 +23,8 @@ 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.
--
2.19.0
2.19.1