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

Update Paper to MC 1.11.1

Browse source
This commit is contained in:
Zach Brown 2016-12-20 16:34:27 -06:00
parent f4ea1998ee
commit 33163525f3
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
166 changed files with 538 additions and 699 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/0001-POM-changes.patch
View file

@ -1,11 +1,11 @@
From 9576b81c87a4dfb2e3f672f6435779e65468e671 Mon Sep 17 00:00:00 2001
From 75d4b845b027f8df6561282a96dd6ede8c272b2f Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 17:16:08 -0600
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 4b788b0..20159ad 100644
index 65839cb..c32903b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,35 +4,37 @@
@ -24,7 +24,7 @@ index 4b788b0..20159ad 100644
- <artifactId>spigot-api</artifactId>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
<version>1.11-R0.1-SNAPSHOT</version>
<version>1.11.1-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>
@ -133,5 +133,5 @@ index 4b788b0..20159ad 100644
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
--
2.10.2
2.9.3

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

@ -1,4 +1,4 @@
From 1fd8e7ad43cd1fd7602774dc31d963d1078406c6 Mon Sep 17 00:00:00 2001
From ec0213d43bbad628561225629bda86b4cd9dc489 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
@ -37,10 +37,10 @@ index 9b310d8..87648ae 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 eea7239..6c2366b 100644
index eea7239..915d8a5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -239,6 +239,22 @@ public interface Server extends PluginMessageRecipient {
@@ -239,6 +239,26 @@ public interface Server extends PluginMessageRecipient {
*/
public int broadcastMessage(String message);
@ -50,24 +50,28 @@ index eea7239..6c2366b 100644
+ *
+ * @param component the component to send
+ */
+ public void broadcast(net.md_5.bungee.api.chat.BaseComponent component);
+ public default void broadcast(net.md_5.bungee.api.chat.BaseComponent component) {
+ spigot().broadcast(component);
+ }
+
+ /**
+ * Sends an array of components as a single message to all online players.
+ *
+ * @param components the components to send
+ */
+ public void broadcast(net.md_5.bungee.api.chat.BaseComponent... components);
+ public default void broadcast(net.md_5.bungee.api.chat.BaseComponent... components) {
+ spigot().broadcast(components);
+ }
+ // Paper end
+
/**
* 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/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index bca09f0..3295674 100644
index ebe727a..5f74d9d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -390,6 +390,30 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -390,6 +390,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void sendMap(MapView map);
@ -77,14 +81,18 @@ index bca09f0..3295674 100644
+ *
+ * @param component the components to send
+ */
+ public void sendMessage(net.md_5.bungee.api.chat.BaseComponent component);
+ public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
+ spigot().sendMessage(component);
+ }
+
+ /**
+ * Sends an array of components as a single message to the player
+ *
+ * @param components the components to send
+ */
+ public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components);
+ public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
+ spigot().sendMessage(components);
+ }
+
+ /**
+ * Sends an array of components as a single message to the specified screen position of this player
@ -92,12 +100,14 @@ index bca09f0..3295674 100644
+ * @param position the screen position
+ * @param components the components to send
+ */
+ public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components);
+ public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
+ spigot().sendMessage(position, components);
+ }
+ // Paper end
+
/**
* Forces an update of the player's entire inventory.
*
--
2.10.2
2.9.3

12
Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
View file

@ -1,4 +1,4 @@
From 20302a2aa7ce4804ef279e8c927a6915b7f59a15 Mon Sep 17 00:00:00 2001
From fa2d6467d3483f75538099c4ce6cff68bd0a5c93 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 29 Feb 2016 20:02:40 -0600
Subject: [PATCH] Player Tab List and Title APIs
@ -369,7 +369,7 @@ index 0000000..e1ecd44
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 27e0f07..50b4fb2 100644
index 5f74d9d..8641bb9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2,6 +2,7 @@ package org.bukkit.entity;
@ -380,10 +380,10 @@ index 27e0f07..50b4fb2 100644
import org.bukkit.Achievement;
import org.bukkit.ChatColor;
import org.bukkit.Effect;
@@ -412,6 +413,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @param components the components to send
*/
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components);
@@ -418,6 +419,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components);
}
+
+ /**
+ * Set the text displayed in the player list header and footer for this player

20
Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
View file

@ -1,4 +1,4 @@
From b7c4b62a1912e41a56a29d095248312c8a8f2699 Mon Sep 17 00:00:00 2001
From f48b3a42b4d30b888395ba3c184dcd9cf7cfd55c Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Tue, 8 Mar 2016 13:05:59 -0800
Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
@ -40,7 +40,7 @@ index 148756b..4ad0028 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9f67d09..5b7ca6a 100644
index 8641bb9..0a11a51 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -397,6 +397,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -48,17 +48,17 @@ index 9f67d09..5b7ca6a 100644
* @param component the components to send
*/
+ @Override
public void sendMessage(net.md_5.bungee.api.chat.BaseComponent component);
/**
@@ -404,6 +405,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
spigot().sendMessage(component);
}
@@ -406,6 +407,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*
* @param components the components to send
*/
+ @Override
public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components);
/**
public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(components);
}
--
2.10.2
2.9.3

8
Spigot-API-Patches/0022-Complete-resource-pack-API.patch
View file

@ -1,14 +1,14 @@
From 699be1d39a7401d680acf2d47ab0defa3c33a536 Mon Sep 17 00:00:00 2001
From 5865959ee46d30a03b7961c997a06ca7f0d022f8 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 22:59:54 -0400
Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1fe4794..bf4c31b 100644
index 0a11a51..083e60f 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1166,7 +1166,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1172,7 +1172,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @throws IllegalArgumentException Thrown if the URL is null.
* @throws IllegalArgumentException Thrown if the URL is too long. The
* length restriction is an implementation specific arbitrary value.
@ -18,7 +18,7 @@ index 1fe4794..bf4c31b 100644
public void setResourcePack(String url);
/**
@@ -1509,6 +1511,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1515,6 +1517,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setViewDistance(int viewDistance);

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

@ -1,4 +1,4 @@
From 72e6b053e69f99ec47de74886e42b95776a23ede Mon Sep 17 00:00:00 2001
From 51b97e731012cb0fefc1a80e3b8805f38e3751fe 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
@ -24,10 +24,10 @@ index 87648ae..1e98f39 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 6c2366b..33e6080 100644
index 915d8a5..1b682b5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1011,4 +1011,6 @@ public interface Server extends PluginMessageRecipient {
@@ -1015,4 +1015,6 @@ public interface Server extends PluginMessageRecipient {
}
Spigot spigot();
@ -105,5 +105,5 @@ index 1302773..9ce0a5d 100644
+
}
--
2.10.2
2.9.3

8
Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
View file

@ -1,4 +1,4 @@
From 578af17993c01766dadb6c7c005fa42d98a4fb7b Mon Sep 17 00:00:00 2001
From d103b8d2293a1ceeb3ac328711f78cffe566098d 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
@ -26,10 +26,10 @@ index 1e98f39..eb6fb2c 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 33e6080..0850009 100644
index 1b682b5..c2b61f1 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1013,4 +1013,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1017,4 +1017,12 @@ public interface Server extends PluginMessageRecipient {
Spigot spigot();
void reloadPermissions(); // Paper
@ -43,5 +43,5 @@ index 33e6080..0850009 100644
+ Entity getEntity(UUID uuid); // Paper
}
--
2.10.2
2.9.3

4
Spigot-API-Patches/0040-Add-EntityZapEvent.patch → Spigot-API-Patches/0039-Add-EntityZapEvent.patch
View file

@ -1,4 +1,4 @@
From 7a5e519b5a40b6210703aded7140542fbfbe9a9d Mon Sep 17 00:00:00 2001
From 37aa6e6fb396fb0b13a380e9bba7993f3c7629b7 Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Sun, 16 Oct 2016 23:19:34 -0700
Subject: [PATCH] Add EntityZapEvent
@ -119,5 +119,5 @@ index aa80ebf..73844b8 100644
+ // Paper end
}
--
2.10.2
2.9.3

25
Spigot-API-Patches/0039-Add-debug-logging-to-Timings-enable-setter.patch
View file

@ -1,25 +0,0 @@
From 4d20b34e3e83e6ed7d517b88c05bc77558641412 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 26 Oct 2016 15:49:28 -0500
Subject: [PATCH] Add debug logging to Timings enable setter
Potentially temporary, will be merged back into main Timings patch if not.
`java -Dtimings.throwOnChange=true -jar paperclip.jar`
diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
index 4e5cf35..bef7cf7 100644
--- a/src/main/java/co/aikar/timings/Timings.java
+++ b/src/main/java/co/aikar/timings/Timings.java
@@ -128,6 +128,9 @@ public final class Timings {
public static void setTimingsEnabled(boolean enabled) {
timingsEnabled = enabled;
reset();
+ if (Boolean.getBoolean("timings.throwOnChange")) {
+ new RuntimeException("The enable state of timings has been changed to: " + enabled).printStackTrace();
+ }
}
/**
--
2.10.2

4
Spigot-API-Patches/0041-Misc-Utils.patch → Spigot-API-Patches/0040-Misc-Utils.patch
View file

@ -1,4 +1,4 @@
From 6e4c05b271039c42a798abb3db3d414d50b0111f Mon Sep 17 00:00:00 2001
From e8be384aca64a96173cf48b19340a6a92573bbb1 Mon Sep 17 00:00:00 2001
From: vemacs <d@nkmem.es>
Date: Wed, 23 Nov 2016 12:53:43 -0500
Subject: [PATCH] Misc Utils
@ -42,5 +42,5 @@ index 0000000..d60ecbb
+ }
+}
--
2.10.2
2.9.3

8
Spigot-API-Patches/0042-Allow-Reloading-of-Command-Aliases.patch → Spigot-API-Patches/0041-Allow-Reloading-of-Command-Aliases.patch
View file

@ -1,4 +1,4 @@
From 9b519772c330599ddd6a645e9d619ab21ef7d4e0 Mon Sep 17 00:00:00 2001
From b315acf6f03fd6fd14a9dfbcff844eae1fbf2d19 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Mon, 28 Nov 2016 10:16:39 -0500
Subject: [PATCH] Allow Reloading of Command Aliases
@ -24,10 +24,10 @@ index eb6fb2c..e16a02c 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 0850009..371e62a 100644
index c2b61f1..09f3e20 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1021,4 +1021,6 @@ public interface Server extends PluginMessageRecipient {
@@ -1025,4 +1025,6 @@ public interface Server extends PluginMessageRecipient {
* @return The entity that is identified by the given UUID, or null if one isn't found
*/
Entity getEntity(UUID uuid); // Paper
@ -91,5 +91,5 @@ index 040509c..585bac7 100644
confirmed = true;
} else {
--
2.10.0
2.9.3

4
Spigot-API-Patches/0043-Add-source-to-PlayerExpChangeEvent.patch → Spigot-API-Patches/0042-Add-source-to-PlayerExpChangeEvent.patch
View file

@ -1,4 +1,4 @@
From f57d12d51fc55db4fe7c81778e0390d69f62087c Mon Sep 17 00:00:00 2001
From ad3832340e806dd7772de4ec8ae594767d2ad294 Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Thu, 8 Sep 2016 08:47:08 -0700
Subject: [PATCH] Add source to PlayerExpChangeEvent
@ -53,5 +53,5 @@ index f37491d..3088255 100644
*
* @return The amount of experience
--
2.10.2
2.9.3

2
Spigot-API-Patches/0044-Add-ProjectileCollideEvent.patch → Spigot-API-Patches/0043-Add-ProjectileCollideEvent.patch
View file

@ -1,4 +1,4 @@
From 40cc96eda623cddf95322ad4ca1d0ae665625ba1 Mon Sep 17 00:00:00 2001
From 5d1ab8bdc2d9069a20154ef1be9eb8fe3080cc68 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Fri, 16 Dec 2016 21:25:39 -0600
Subject: [PATCH] Add ProjectileCollideEvent

6
Spigot-API-Patches/0045-Add-String-based-Action-Bar-API.patch → Spigot-API-Patches/0044-Add-String-based-Action-Bar-API.patch
View file

@ -1,11 +1,11 @@
From 7b2810ce185f4805e505de6701cafb5ef86a5687 Mon Sep 17 00:00:00 2001
From 096901560b7ced2820b8f131d8633ccfab953a57 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 20 Dec 2016 15:55:55 -0500
Subject: [PATCH] Add String based Action Bar API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index bf4c31ba..5c38b3f3 100644
index 083e60f..4d577a5 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -392,6 +392,12 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -22,5 +22,5 @@ index bf4c31ba..5c38b3f3 100644
* Sends the component to the player
*
--
2.11.0
2.9.3