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

Update upstream B/CB

Browse Source 
Closes GH-569
This commit is contained in:
Zach Brown
2017-01-06 15:45:59 -06:00
parent 849653ebac
commit 63130fd2aa
140 changed files with 381 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Spigot-API-Patches/0015-Expose-server-CommandMap.patch
View File

@@ -1,11 +1,11 @@
From 8a43d9544b79be8a253b9129e32735c12aaf6a44 Mon Sep 17 00:00:00 2001
From 3cd44a0e52ef2aa66f77783cd077eb6923ce0acc 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 ed646ca..9b310d8 100644
index 3b16953..07077ec 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 ed646ca..9b310d8 100644
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@@ -1149,6 +1146,17 @@ public final class Bukkit {
@@ -1161,6 +1158,17 @@ public final class Bukkit {
return server.getUnsafe();
}
@@ -39,7 +39,7 @@ index ed646ca..9b310d8 100644
{
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 09f921a..eea7239 100644
index a4e6894..4463ab3 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,9 +54,9 @@ index 09f921a..eea7239 100644
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@@ -933,6 +930,14 @@ public interface Server extends PluginMessageRecipient {
*/
@@ -943,6 +940,14 @@ public interface Server extends PluginMessageRecipient {
public double[] getTPS();
// Paper end
+ // Paper start
+ /**
@@ -70,5 +70,5 @@ index 09f921a..eea7239 100644
* @see UnsafeValues
* @return the unsafe values instance
--
2.10.2
2.9.3