Update Upstream

This commit is contained in:
Spottedleaf 2019-05-05 19:58:04 -07:00
commit eeb2ecd789
348 changed files with 1661 additions and 1710 deletions

View file

@ -1,14 +1,14 @@
From 50730348c82fbebf291c65472b8882a41687005d Mon Sep 17 00:00:00 2001
From e4492ea2ddcebc431c20d0933e4dc7f85090695d 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 9579437b..8d23ad74 100644
index eb5860b2..3f934c80 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -763,6 +763,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -776,6 +776,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Collection<Entity> getNearbyEntities(@NotNull Location location, double x, double y, double z);