Update Upstream

2019-05-05 19:58:04 -07:00
parent cb24079b77
commit eeb2ecd789
348 changed files with 1661 additions and 1710 deletions
--- a/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch
@@ -0,0 +1,29 @@
+From 2f6b011840b265acb30a8a757cdfecbef37f4d10 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 c4818af828..9a92d5b077 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -1119,6 +1119,15 @@ public class CraftWorld implements World {
+         return list;
+     }
+ 
+    // Paper start - getEntity by UUID API
+    @Override
+    public Entity getEntity(UUID uuid) {
+        Validate.notNull(uuid, "UUID cannot be null");
+        net.minecraft.server.Entity entity = world.getEntity(uuid);
+        return entity == null ? null : entity.getBukkitEntity();
+    }
+    // Paper end
+
+     @Override
+     public void save() {
+         this.server.checkSaveState();
+-- 
+2.21.0
+