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-12-27 22:45:33 -06:00
parent a1b538fc71
commit eb0f5adfdc
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
23 changed files with 163 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,11 @@
From a5783dd1bfe8f0f0166976f3afc04a1f35ba3acb Mon Sep 17 00:00:00 2001
From 43344bd333e548df23d8a9d68833c74d63d84964 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 8ee129d9..133d1660 100644
index 73ef3193..4220760f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,39 +3,39 @@
@ -32,9 +32,9 @@ index 8ee129d9..133d1660 100644
<description>An enhanced plugin API for Minecraft servers.</description>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <!-- Paper - Bump to 1.8 - Because Duh... -->
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <!-- Paper - Bump to 1.8 - Get off your dinosaur and get on this rocket ship... -->
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -157,5 +157,5 @@ index 8ee129d9..133d1660 100644
- </profiles>
</project>
--
2.15.0
2.15.1.windows.2

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

@ -1,4 +1,4 @@
From 5d5dc477a6998af553a15def100d0ef1407b6dba Mon Sep 17 00:00:00 2001
From 64f62bc4e2c8b60a6679fbcc608d1a5ee8fe7944 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
@ -3610,10 +3610,10 @@ index 80c6a72e..759c4617 100644
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
} else {
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index 4cffa137..b2cbf9e4 100644
index d7d5ac7b..a657fce5 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -15,7 +15,8 @@ import org.bukkit.plugin.PluginDescriptionFile;
@@ -23,7 +23,8 @@ import org.bukkit.plugin.PluginDescriptionFile;
/**
* A ClassLoader for plugins, to allow shared classes across multiple plugins
*/
@ -3866,5 +3866,5 @@ index 8d982974..7e89b97b 100644
- }
}
--
2.15.0
2.15.1.windows.2

16
Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
View file

@ -1,4 +1,4 @@
From 3b173da428895d6a961b7d68065468338beef633 Mon Sep 17 00:00:00 2001
From e7a4374c01a9df9539436e80ac3b8eba4eebdc92 Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Thu, 21 Sep 2017 19:41:20 +0200
Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
@ -77,10 +77,10 @@ index 0abad9ad..14dda205 100644
/**
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index b2cbf9e4..2a4587e8 100644
index a657fce5..67b53d4e 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -25,6 +25,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -36,6 +36,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
final JavaPlugin plugin;
private JavaPlugin pluginInit;
private IllegalStateException pluginState;
@ -88,16 +88,16 @@ index b2cbf9e4..2a4587e8 100644
// Spigot Start
static
@@ -59,6 +60,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
this.dataFolder = dataFolder;
this.file = file;
@@ -73,6 +74,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
this.manifest = jar.getManifest();
this.url = file.toURI().toURL();
+ this.logger = new com.destroystokyo.paper.utils.PaperPluginLogger(description); // Paper - Register logger early
+
try {
Class<?> jarClass;
try {
@@ -126,6 +129,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -177,6 +180,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
pluginState = new IllegalStateException("Initial initialization");
this.pluginInit = javaPlugin;
@ -106,5 +106,5 @@ index b2cbf9e4..2a4587e8 100644
}
}
--
2.14.1.windows.1
2.15.1.windows.2