Update B/CB/S

Closes GH-288
This commit is contained in:
Zach Brown
2016-05-20 17:32:50 -05:00
parent d22f9071ff
commit df1df5d4b4
16 changed files with 57 additions and 52 deletions

View File

@@ -1,4 +1,4 @@
From 60d48a782502bf6c276124acfd412f18390a4ac7 Mon Sep 17 00:00:00 2001
From 85092d7597bb75335744094cdc93a0fd367e4a4c Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Wed, 30 Mar 2016 01:20:11 -0500
Subject: [PATCH] Add getEntity by UUID API
@@ -30,7 +30,7 @@ index 3d2e0b6..842e364 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e957ed0..0a5301f 100644
index e6cce51..a0478f2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -46,6 +46,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;
@@ -41,7 +41,7 @@ index e957ed0..0a5301f 100644
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.craftbukkit.generator.CraftChunkData;
import org.bukkit.craftbukkit.help.SimpleHelpMap;
@@ -1858,5 +1859,14 @@ public final class CraftServer implements Server {
@@ -1865,5 +1866,14 @@ public final class CraftServer implements Server {
});
}
}