Update API patches to MC 1.12pre2

This commit is contained in:
Zach Brown
2017-05-14 08:46:44 -05:00
parent e4f891c95a
commit 828d600143
21 changed files with 135 additions and 135 deletions

View File

@@ -1,11 +1,11 @@
From 37f9f5c93bf615201883c1dc2daf4575865f440e Mon Sep 17 00:00:00 2001
From cbcb424cbb5b28efffe80c1fb6f641332954ba25 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Mon, 29 Feb 2016 19:48:59 -0600
Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 3b16953a..07077ec4 100644
index 4f094f7b..5147cbda 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor;
@@ -20,7 +20,7 @@ index 3b16953a..07077ec4 100644
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@@ -1161,6 +1158,17 @@ public final class Bukkit {
@@ -1154,6 +1151,17 @@ public final class Bukkit {
return server.getUnsafe();
}
@@ -39,7 +39,7 @@ index 3b16953a..07077ec4 100644
{
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a4e68943..4463ab33 100644
index a503bb49..ed3a7197 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor;
@@ -54,7 +54,7 @@ index a4e68943..4463ab33 100644
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@@ -943,6 +940,14 @@ public interface Server extends PluginMessageRecipient {
@@ -928,6 +925,14 @@ public interface Server extends PluginMessageRecipient {
public double[] getTPS();
// Paper end
@@ -67,8 +67,8 @@ index a4e68943..4463ab33 100644
+ CommandMap getCommandMap();
+
/**
* @see UnsafeValues
* @return the unsafe values instance
* Get the advancement specified by this key.
*
--
2.13.0.windows.1
2.11.0