mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB/S

Browse source
This commit is contained in:
Zach Brown 2017-05-15 11:25:20 -05:00
parent 8e610af635
commit baf762a2c1
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
26 changed files with 123 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Spigot-API-Patches/0015-Expose-server-CommandMap.patch
View file

@ -1,11 +1,11 @@
From cbcb424cbb5b28efffe80c1fb6f641332954ba25 Mon Sep 17 00:00:00 2001
From ee9faa9162c7b9f27b5b1072e016c288f54f8e6a 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 4f094f7b..5147cbda 100644
index 89135b86..94ec8189 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 4f094f7b..5147cbda 100644
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@@ -1154,6 +1151,17 @@ public final class Bukkit {
@@ -1164,6 +1161,17 @@ public final class Bukkit {
return server.getUnsafe();
}
@ -39,7 +39,7 @@ index 4f094f7b..5147cbda 100644
{
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a503bb49..ed3a7197 100644
index c81c073d..63624ff6 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;
@ -70,5 +70,5 @@ index a503bb49..ed3a7197 100644
* Get the advancement specified by this key.
*
--
2.11.0
2.13.0