Update Paper to MC 1.11

This commit is contained in:
Zach Brown
2016-11-16 20:23:38 -06:00
parent 6c1880847f
commit a6d146a939
193 changed files with 1635 additions and 1846 deletions

View File

@@ -1,14 +1,14 @@
From 1ec57a41072c805aeeb8efb10cac8b4738cb4aab Mon Sep 17 00:00:00 2001
From 2ab72f61fd122921fba37d85ee45181482a8b1bc 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 b01cd7d..3161b87 100644
index 28a54fd..152f1d1 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1189,6 +1189,16 @@ public final class Bukkit {
@@ -1170,6 +1170,16 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
@@ -26,10 +26,10 @@ index b01cd7d..3161b87 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 b527372..edf0d04 100644
index 4d82c6f..4b56131 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1020,4 +1020,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1003,4 +1003,12 @@ public interface Server extends PluginMessageRecipient {
Spigot spigot();
void reloadPermissions(); // Paper
@@ -43,5 +43,5 @@ index b527372..edf0d04 100644
+ Entity getEntity(UUID uuid); // Paper
}
--
2.9.2.windows.1
2.10.2