Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update upstream B/CB

Browse Source
This commit is contained in:
Zach Brown
2016-08-07 00:01:31 -05:00
parent 01a09f8ff1
commit 15f3ca7ecb
12 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0111-Add-getEntity-by-UUID-API.patch
View File

@@ -1,4 +1,4 @@
From 7cf0e711c6c80eb556adeb298480439f15a9405f Mon Sep 17 00:00:00 2001
From 973902abbfc253161bc46db73cd093935edcc851 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
@@ -26,7 +26,7 @@ index 453e600..11770ad 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8f08fa5..91d00dc 100644
index e676a01..a9976f4 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;
@@ -37,7 +37,7 @@ index 8f08fa5..91d00dc 100644
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.craftbukkit.generator.CraftChunkData;
import org.bukkit.craftbukkit.help.SimpleHelpMap;
@@ -1865,5 +1866,14 @@ public final class CraftServer implements Server {
@@ -1861,5 +1862,14 @@ public final class CraftServer implements Server {
});
}
}
@@ -53,5 +53,5 @@ index 8f08fa5..91d00dc 100644
// Paper end
}
--
2.9.0
2.9.2.windows.1