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

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
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
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/0003-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 30dc07b0d34561883d0c878ff8ad5f9b70c98cb2 Mon Sep 17 00:00:00 2001
From d01fb3a2f5dbe0d60e5d7bfd25c16a040df5315e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2
@ -2888,10 +2888,10 @@ index 0000000..3a288d2
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5d8422e..ac8b0f5 100644
index 07b44eb..07530ff 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -537,7 +537,6 @@ public final class Bukkit {
@@ -538,7 +538,6 @@ public final class Bukkit {
*/
public static void reload() {
server.reload();
@ -2900,10 +2900,10 @@ index 5d8422e..ac8b0f5 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c5c3506..3cc741b 100644
index 2a9c860..36d0be2 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -925,12 +925,27 @@ public interface Server extends PluginMessageRecipient {
@@ -935,12 +935,27 @@ public interface Server extends PluginMessageRecipient {
public class Spigot
{

10
Spigot-API-Patches/0005-Add-getTPS-method.patch
View file

@ -1,14 +1,14 @@
From 10486c5a17f63eecf703a772acd168b74c0f6d40 Mon Sep 17 00:00:00 2001
From 4af32b49e181ea1b8eff460f6d5906e3415d0a4b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 17:24:57 -0600
Subject: [PATCH] Add getTPS method
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index ac8b0f5..86102a6 100644
index 07530ff..ed646ca 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1121,6 +1121,14 @@ public final class Bukkit {
@@ -1133,6 +1133,14 @@ public final class Bukkit {
}
/**
@ -24,10 +24,10 @@ index ac8b0f5..86102a6 100644
* @return the unsafe values instance
*/
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3cc741b..1e65835 100644
index 36d0be2..09f921a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -917,6 +917,13 @@ public interface Server extends PluginMessageRecipient {
@@ -927,6 +927,13 @@ public interface Server extends PluginMessageRecipient {
BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag ...flags);
/**

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

@ -1,11 +1,11 @@
From a6fae8f6ab073c9006b14b039aebbf7e1d64e242 Mon Sep 17 00:00:00 2001
From 8a43d9544b79be8a253b9129e32735c12aaf6a44 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 86102a6..5b0441a 100644
index ed646ca..9b310d8 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 86102a6..5b0441a 100644
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@@ -1137,6 +1134,17 @@ public final class Bukkit {
@@ -1149,6 +1146,17 @@ public final class Bukkit {
return server.getUnsafe();
}
@ -39,7 +39,7 @@ index 86102a6..5b0441a 100644
{
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 1e65835..de22136 100644
index 09f921a..eea7239 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 1e65835..de22136 100644
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@@ -923,6 +920,14 @@ public interface Server extends PluginMessageRecipient {
@@ -933,6 +930,14 @@ public interface Server extends PluginMessageRecipient {
*/
public double[] getTPS();

10
Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
View file

@ -1,4 +1,4 @@
From 6767da41cfeee8b2ed1f1aa00d88af198fbc7a28 Mon Sep 17 00:00:00 2001
From 1fd8e7ad43cd1fd7602774dc31d963d1078406c6 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 19:54:32 -0600
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
Change Javadoc to be accurate
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5b0441a..5265d68 100644
index 9b310d8..87648ae 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -292,6 +292,26 @@ public final class Bukkit {
@@ -293,6 +293,26 @@ public final class Bukkit {
return server.broadcastMessage(message);
}
@ -37,10 +37,10 @@ index 5b0441a..5265d68 100644
* Gets the name of the update folder. The update folder is used to safely
* update plugins at the right moment on a plugin load.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index de22136..c8d209e 100644
index eea7239..6c2366b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -238,6 +238,22 @@ public interface Server extends PluginMessageRecipient {
@@ -239,6 +239,22 @@ public interface Server extends PluginMessageRecipient {
*/
public int broadcastMessage(String message);

10
Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
View file

@ -1,4 +1,4 @@
From 8674a30c6579a14d5b0be4b545d2fb296eb9a3eb Mon Sep 17 00:00:00 2001
From 72e6b053e69f99ec47de74886e42b95776a23ede Mon Sep 17 00:00:00 2001
From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:28:07 -0400
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5265d68..28a54fd 100644
index 87648ae..1e98f39 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1163,6 +1163,13 @@ public final class Bukkit {
@@ -1175,6 +1175,13 @@ public final class Bukkit {
public static CommandMap getCommandMap() {
return server.getCommandMap();
}
@ -24,10 +24,10 @@ index 5265d68..28a54fd 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 c8d209e..4d82c6f 100644
index 6c2366b..33e6080 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1001,4 +1001,6 @@ public interface Server extends PluginMessageRecipient {
@@ -1011,4 +1011,6 @@ public interface Server extends PluginMessageRecipient {
}
Spigot spigot();

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