Update upstream

This commit is contained in:
Aikar
2018-07-25 19:05:07 -04:00
parent 23ed74032c
commit 48d75228ed
49 changed files with 260 additions and 260 deletions

View File

@@ -1,14 +1,14 @@
From 454babc0dd55c39343955aaad2b704df8d31d91a Mon Sep 17 00:00:00 2001
From d5f1f0035b77ba250cb2f94108088f729b0ba670 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 3 Jul 2018 16:08:14 +0200
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
@@ -756,6 +756,14 @@ public class CraftWorld implements World {
@@ -752,6 +752,14 @@ public class CraftWorld implements World {
return list;
}