Update upstream B/CB/S

This commit is contained in:
Zach Brown
2018-10-27 00:02:22 -04:00
parent b1ab9ad452
commit c4865a6445
57 changed files with 380 additions and 386 deletions

View File

@@ -1,14 +1,14 @@
From bd43029a77d22976f860f0827bb778454c33adb5 Mon Sep 17 00:00:00 2001
From 51e1884b784aa8d72f01558878e449fad4e643a8 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 da141748bd..b37864e2b8 100644
index 767dc87dd..a7be13c9c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -751,6 +751,14 @@ public class CraftWorld implements World {
@@ -899,6 +899,14 @@ public class CraftWorld implements World {
return list;
}
@@ -24,5 +24,5 @@ index da141748bd..b37864e2b8 100644
// Spigot start
save(true);
--
2.19.0
2.19.1