Merge branch 'master' into pre/1.13

This commit is contained in:
Shane Freeder
2018-08-17 05:10:45 +01:00
18 changed files with 225 additions and 87 deletions

View File

@@ -1,14 +1,14 @@
From 45d25ea6abacf44eee688b4e2bb8140be49fd359 Mon Sep 17 00:00:00 2001
From c0c64949e3296c8076656d6fab742b57a71299d3 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 81d9e1df..6e583b42 100644
index ef3a2f2d2..860e4374f 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -657,6 +657,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -690,6 +690,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public Collection<Entity> getNearbyEntities(Location location, double x, double y, double z);