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

Update B/CB/S

Browse source
This commit is contained in:
Shane Freeder 2017-11-08 16:13:57 +00:00
parent d1d4f3b465
commit 1d03f56bd6
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
38 changed files with 216 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Spigot-API-Patches/0003-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 98b1fecba12a6cdde5a5c08d9dc2a84851a7669b Mon Sep 17 00:00:00 2001
From ca6ed8efa01a2413602e10e9d81b8187aee6013a 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
@ -3062,10 +3062,10 @@ index 08a9739f..347d2189 100644
return true;
}
diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
index 3f07d7f4..f89ad075 100644
index 50257883..9c80f464 100644
--- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
+++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
@@ -14,6 +14,7 @@ public class FormattedCommandAlias extends Command {
@@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command {
public FormattedCommandAlias(String alias, String[] formatStrings) {
super(alias);
@ -3073,7 +3073,7 @@ index 3f07d7f4..f89ad075 100644
this.formatStrings = formatStrings;
}
@@ -118,6 +119,9 @@ public class FormattedCommandAlias extends Command {
@@ -113,6 +114,9 @@ public class FormattedCommandAlias extends Command {
return formatString;
}
@ -3195,7 +3195,7 @@ index 00000000..5527e7c8
+
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 71709126..b886cd82 100644
index 1b5b37bf..bdc0de8c 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -31,7 +31,7 @@ public class SimpleCommandMap implements CommandMap {
@ -3488,7 +3488,7 @@ index bba914d7..00000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index bd2cc354..d2a78f56 100644
index 8af5f849..f4eff6b7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1520,6 +1520,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -3504,10 +3504,10 @@ index bd2cc354..d2a78f56 100644
@Override
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index b3bcda52..041a4cd7 100644
index 8b130abb..80c152ba 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -292,7 +292,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -293,7 +293,6 @@ public final class SimplePluginManager implements PluginManager {
}
}
@ -3515,7 +3515,7 @@ index b3bcda52..041a4cd7 100644
return result.toArray(new Plugin[result.size()]);
}
@@ -329,7 +328,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -330,7 +329,7 @@ public final class SimplePluginManager implements PluginManager {
if (result != null) {
plugins.add(result);
@ -3524,7 +3524,7 @@ index b3bcda52..041a4cd7 100644
}
return result;
@@ -355,7 +354,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -356,7 +355,7 @@ public final class SimplePluginManager implements PluginManager {
* @return Plugin if it exists, otherwise null
*/
public synchronized Plugin getPlugin(String name) {
@ -3533,7 +3533,7 @@ index b3bcda52..041a4cd7 100644
}
public synchronized Plugin[] getPlugins() {
@@ -553,7 +552,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -554,7 +553,8 @@ public final class SimplePluginManager implements PluginManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}
@ -3543,7 +3543,7 @@ index b3bcda52..041a4cd7 100644
getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
} else {
getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
@@ -729,7 +729,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -730,7 +730,7 @@ public final class SimplePluginManager implements PluginManager {
}
public boolean useTimings() {
@ -3552,7 +3552,7 @@ index b3bcda52..041a4cd7 100644
}
/**
@@ -738,6 +738,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -739,6 +739,6 @@ public final class SimplePluginManager implements PluginManager {
* @param use True if per event timing code should be used
*/
public void useTimings(boolean use) {
@ -3866,5 +3866,5 @@ index 8d982974..7e89b97b 100644
- }
}
--
2.13.0
2.14.3

8
Spigot-API-Patches/0007-Entity-Origin-API.patch
View file

@ -1,14 +1,14 @@
From 5992f37d03b1b4cf413785d1b9e716a1b48de5da Mon Sep 17 00:00:00 2001
From 31343663dd75e733ce5d1112dabc76dae04f3ec1 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 17:50:31 -0600
Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index e454e70a..c86c1c5f 100644
index 219ec25f..69fbdb3c 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -495,4 +495,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -497,4 +497,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@Override
Spigot spigot();
// Spigot end
@ -65,5 +65,5 @@ index fcd0a9b2..2abef57c 100644
+ }
}
--
2.13.0.windows.1
2.14.3

14
Spigot-API-Patches/0018-Add-exception-reporting-event.patch
View file

@ -1,4 +1,4 @@
From 04898a9642c98cc38ace2c8862794f1710081a7d Mon Sep 17 00:00:00 2001
From 95df32df8d98c5ca8434f09312bade707628c21c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:24:35 -0600
Subject: [PATCH] Add exception reporting event
@ -458,7 +458,7 @@ index 00000000..5582999f
+ }
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index b886cd82..f1e9f200 100644
index bdc0de8c..762eb1d2 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -10,6 +10,9 @@ import java.util.List;
@ -494,7 +494,7 @@ index b886cd82..f1e9f200 100644
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 041a4cd7..68dd3332 100644
index 80c152ba..b88f31ca 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -18,6 +18,9 @@ import java.util.logging.Level;
@ -507,7 +507,7 @@ index 041a4cd7..68dd3332 100644
import org.apache.commons.lang.Validate;
import org.bukkit.Server;
import org.bukkit.command.Command;
@@ -400,7 +403,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -401,7 +404,8 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().enablePlugin(plugin);
} catch (Throwable ex) {
@ -517,7 +517,7 @@ index 041a4cd7..68dd3332 100644
}
HandlerList.bakeAll();
@@ -419,36 +423,48 @@ public final class SimplePluginManager implements PluginManager {
@@ -420,36 +424,48 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().disablePlugin(plugin);
} catch (Throwable ex) {
@ -571,7 +571,7 @@ index 041a4cd7..68dd3332 100644
public void clearPlugins() {
synchronized (this) {
disablePlugins();
@@ -510,7 +526,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -511,7 +527,13 @@ public final class SimplePluginManager implements PluginManager {
));
}
} catch (Throwable ex) {
@ -587,5 +587,5 @@ index 041a4cd7..68dd3332 100644
}
}
--
2.13.0
2.14.3

19
Spigot-API-Patches/0025-Add-sender-name-to-commands.yml-replacement.patch
View file

@ -1,4 +1,4 @@
From 3f129e5794812a7a026249ae923b9acfa2849511 Mon Sep 17 00:00:00 2001
From dc7ba2b869b5b5eefdac16a147446461bb40538f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 22 Jul 2015 18:50:41 -0400
Subject: [PATCH] Add sender name to commands.yml replacement
@ -7,19 +7,20 @@ This allows you to use $sender in commands.yml definitions to make
commands that auto target self.
diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
index f89ad07..a3e9c63 100644
index 9c80f464..631be1cb 100644
--- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
+++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
@@ -2,6 +2,8 @@ package org.bukkit.command;
@@ -1,6 +1,9 @@
package org.bukkit.command;
import java.util.ArrayList;
import java.util.logging.Level;
+import java.util.logging.Level;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
@@ -24,7 +26,7 @@ public class FormattedCommandAlias extends Command {
@@ -19,7 +22,7 @@ public class FormattedCommandAlias extends Command {
ArrayList<String> commands = new ArrayList<String>();
for (String formatString : formatStrings) {
try {
@ -28,7 +29,7 @@ index f89ad07..a3e9c63 100644
} catch (Throwable throwable) {
if (throwable instanceof IllegalArgumentException) {
sender.sendMessage(throwable.getMessage());
@@ -42,7 +44,10 @@ public class FormattedCommandAlias extends Command {
@@ -37,7 +40,10 @@ public class FormattedCommandAlias extends Command {
return result;
}
@ -37,9 +38,9 @@ index f89ad07..a3e9c63 100644
+ if (formatString.contains("$sender")) { // Paper
+ formatString = formatString.replaceAll(Pattern.quote("$sender"), Matcher.quoteReplacement(sender.getName())); // Paper
+ } // Paper
int index = formatString.indexOf("$");
int index = formatString.indexOf('$');
while (index != -1) {
int start = index;
--
2.9.2.windows.1
2.14.3

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

@ -1,4 +1,4 @@
From bac0e244d24ae13f16066fb8c866fea62ea88ad3 Mon Sep 17 00:00:00 2001
From a7bb808c73465c11139f17b0d498acd2b3a3cb58 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,7 +6,7 @@ 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 970d651b..4a725d79 100644
index 73157ff9..fd423664 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1190,6 +1190,13 @@ public final class Bukkit {
@ -24,7 +24,7 @@ index 970d651b..4a725d79 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 9de7693a..3c550d06 100644
index 18549ce0..032d6211 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1028,4 +1028,6 @@ public interface Server extends PluginMessageRecipient {
@ -87,10 +87,10 @@ index c70d5129..040509c1 100644
+
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 9d7bdeef..21f898bf 100644
index b88f31ca..bd0588a2 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -762,4 +762,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -763,4 +763,13 @@ public final class SimplePluginManager implements PluginManager {
public void useTimings(boolean use) {
co.aikar.timings.Timings.setTimingsEnabled(use); // Spigot
}
@ -105,5 +105,5 @@ index 9d7bdeef..21f898bf 100644
+
}
--
2.13.2
2.14.3

12
Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
View file

@ -1,4 +1,4 @@
From f7bf3b52cb8544319a06bd35ffd803c7e488a6c2 Mon Sep 17 00:00:00 2001
From 65b664ebccc15a537ec64b3a777ba6481259dde4 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
@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
Reload the aliases stored in commands.yml
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 4a725d79..498dfd33 100644
index fd423664..5431b17b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1197,6 +1197,15 @@ public final class Bukkit {
@ -26,7 +26,7 @@ index 4a725d79..498dfd33 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 3c550d06..4f077b7c 100644
index 032d6211..83b370e5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1030,4 +1030,6 @@ public interface Server extends PluginMessageRecipient {
@ -55,10 +55,10 @@ index 30d60247..938959aa 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index f1e9f200..c6613c0a 100644
index 762eb1d2..23d08336 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -280,4 +280,10 @@ public class SimpleCommandMap implements CommandMap {
@@ -281,4 +281,10 @@ public class SimpleCommandMap implements CommandMap {
}
}
}
@ -97,5 +97,5 @@ index 040509c1..0069bcc0 100644
confirmed = true;
} else {
--
2.13.2
2.14.3

8
Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
View file

@ -1,14 +1,14 @@
From e7f452ae1e545a3dfa9adf5c634a3f17a8c0b791 Mon Sep 17 00:00:00 2001
From a8aa41de68178cdcd147a3380b5c4bd10f3afd85 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index c86c1c5f..57f62ae4 100644
index 69fbdb3c..6fc00fdf 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -505,5 +505,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -507,5 +507,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
* @return Location where entity originates or null if not yet added
*/
Location getOrigin();
@ -22,5 +22,5 @@ index c86c1c5f..57f62ae4 100644
// Paper end
}
--
2.14.1
2.14.3