SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream update

Browse Source
This commit is contained in:
Aikar
2017-08-07 23:05:16 -04:00
parent 96911e196f
commit 64b2b87256
24 changed files with 32 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-API-Patches/Add-exception-reporting-event.patch
View File

@@ -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 39b275cb..6e9fc84f 100644
index b886cd82..f1e9f200 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -0,0 +0,0 @@ import java.util.List;
@@ -494,7 +494,7 @@ index 39b275cb..6e9fc84f 100644
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index b43ffd36..d68e3bee 100644
index 041a4cd7..68dd3332 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -0,0 +0,0 @@ import java.util.logging.Level;
@@ -553,7 +553,7 @@ index b43ffd36..d68e3bee 100644
try {
server.getMessenger().unregisterIncomingPluginChannel(plugin);
server.getMessenger().unregisterOutgoingPluginChannel(plugin);
} catch(Throwable ex) {
} catch (Throwable ex) {
- server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while unregistering plugin channels for " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
+ handlePluginException("Error occurred (in the plugin loader) while unregistering plugin channels for "
+ + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper

4
Spigot-API-Patches/POM-changes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index f175b611..2fe7b78e 100644
index 31b8f93e..360d2f08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
@@ -84,7 +84,7 @@ index f175b611..2fe7b78e 100644
<dependency>
<groupId>commons-lang</groupId>
@@ -0,0 +0,0 @@
<type>jar</type>
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
+ <!-- bundled with Minecraft, shouldn't ever change -->

10
Spigot-API-Patches/Timings-v2.patch
View File

@@ -2963,7 +2963,7 @@ index 00000000..df592d85
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5649aaf7..b7c939a2 100644
index eb6b7976..a9081ddb 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -0,0 +0,0 @@ public final class Bukkit {
@@ -2975,7 +2975,7 @@ index 5649aaf7..b7c939a2 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 7a08fd1e..7dd895a0 100644
index 83b66361..bc3211f9 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
@@ -3230,7 +3230,7 @@ index 71709126..b886cd82 100644
// Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
deleted file mode 100644
index a8f61f2d..00000000
index bba914d7..00000000
--- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
+++ /dev/null
@@ -0,0 +0,0 @@
@@ -3360,7 +3360,7 @@ index a8f61f2d..00000000
- for (HandlerList handlerList : HandlerList.getHandlerLists()) {
- for (RegisteredListener listener : handlerList.getRegisteredListeners()) {
- if (listener instanceof TimedRegisteredListener) {
- ((TimedRegisteredListener)listener).reset();
- ((TimedRegisteredListener) listener).reset();
- }
- }
- }
@@ -3504,7 +3504,7 @@ 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 a8b4db1c..de0ef125 100644
index b3bcda52..041a4cd7 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {

2
Spigot-API-Patches/Use-ASM-for-event-executors.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
Uses method handles for private or static methods.
diff --git a/pom.xml b/pom.xml
index 1e57d386..de5bc3f3 100644
index c6bdf44e..31b6f51b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@