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-11-21 15:51:27 -06:00
parent eb877d8cdb
commit 97e0eac6e7
21 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
View File

@@ -1,14 +1,14 @@
From 2ab72f61fd122921fba37d85ee45181482a8b1bc Mon Sep 17 00:00:00 2001
From 578af17993c01766dadb6c7c005fa42d98a4fb7b Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Wed, 30 Mar 2016 01:19:51 -0500
Subject: [PATCH] Add getEntity by UUID API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 28a54fd..152f1d1 100644
index 1e98f39..eb6fb2c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1170,6 +1170,16 @@ public final class Bukkit {
@@ -1182,6 +1182,16 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
@@ -26,10 +26,10 @@ index 28a54fd..152f1d1 100644
public static Server.Spigot spigot()
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 4d82c6f..4b56131 100644
index 33e6080..0850009 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1003,4 +1003,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1013,4 +1013,12 @@ public interface Server extends PluginMessageRecipient {
Spigot spigot();
void reloadPermissions(); // Paper