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

Update to 1.14.4 (#2333)

Browse source
This commit is contained in:
Spottedleaf 2019-07-19 21:01:24 -07:00 • committed by Zach
parent a41d51f098
commit 9fe63a1673
328 changed files with 1938 additions and 1954 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,14 @@
From 5517592aa39fa15d51e8e186af82b46219c0223e Mon Sep 17 00:00:00 2001
From 9524ffe0f99ca69cf2478a834000bd6959a981d5 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 b5532ae6..a85aaa1a 100644
index 23d0a44a2..aef4ec33d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,34 +2,29 @@
@@ -2,34 +2,28 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@ -22,8 +22,7 @@ index b5532ae6..a85aaa1a 100644
- <artifactId>spigot-api</artifactId>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
<version>1.14.3-R0.1-SNAPSHOT</version>
+
<version>1.14.4-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>
@ -54,7 +53,7 @@ index b5532ae6..a85aaa1a 100644
<repositories>
<!--
If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
@@ -41,6 +36,10 @@
@@ -41,6 +35,10 @@
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
@ -65,7 +64,7 @@ index b5532ae6..a85aaa1a 100644
</repositories>
<pluginRepositories>
@@ -57,6 +56,20 @@
@@ -57,6 +55,20 @@
<version>2.6</version>
<scope>compile</scope>
</dependency>
@ -86,7 +85,7 @@ index b5532ae6..a85aaa1a 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -113,15 +126,12 @@
@@ -113,15 +125,12 @@
</dependencies>
<build>
@ -103,7 +102,7 @@ index b5532ae6..a85aaa1a 100644
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
@@ -156,6 +166,7 @@
@@ -156,6 +165,7 @@
</execution>
</executions>
<configuration>

6
Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch
View file

@ -1,4 +1,4 @@
From fa8d0d47698759ed68d4d63544b943369a5fa77c Mon Sep 17 00:00:00 2001
From 900d1808e8b2df014a6f10a66d8293484735f9dc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 1 Apr 2016 00:02:47 -0400
Subject: [PATCH] Add FastUtil to Bukkit
@ -6,10 +6,10 @@ Subject: [PATCH] Add FastUtil to Bukkit
Doesn't expose to plugins, just allows Paper-API to use it for optimization
diff --git a/pom.xml b/pom.xml
index a85aaa1a..e65cbc15 100644
index aef4ec33d..2daee11a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,12 @@
@@ -49,6 +49,12 @@
</pluginRepositories>
<dependencies>

22
Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
View file

@ -1,4 +1,4 @@
From 69ce0886b5a5faff5c6f3b0cd144d74e15e26f62 Mon Sep 17 00:00:00 2001
From d87d2f7f427676e03cff1ec88420117d8dd7f993 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 13:20:33 -0700
Subject: [PATCH] Use ASM for event executors.
@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
Uses method handles for private or static methods.
diff --git a/pom.xml b/pom.xml
index e65cbc15..a1dd0ac2 100644
index 2daee11a2..709b7a222 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,17 @@
@@ -128,6 +128,17 @@
<version>7.1</version>
<scope>test</scope>
</dependency>
@ -29,7 +29,7 @@ index e65cbc15..a1dd0ac2 100644
<build>
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
new file mode 100644
index 00000000..5b28e9b1
index 000000000..5b28e9b1d
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
@@ -0,0 +1,42 @@
@ -77,7 +77,7 @@ index 00000000..5b28e9b1
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
new file mode 100644
index 00000000..c8367242
index 000000000..c83672427
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
@@ -0,0 +1,43 @@
@ -126,7 +126,7 @@ index 00000000..c8367242
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
new file mode 100644
index 00000000..b6e7d8ee
index 000000000..b6e7d8ee8
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
@@ -0,0 +1,47 @@
@ -179,7 +179,7 @@ index 00000000..b6e7d8ee
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
new file mode 100644
index 00000000..beed9e6e
index 000000000..beed9e6e0
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
@@ -0,0 +1,35 @@
@ -220,7 +220,7 @@ index 00000000..beed9e6e
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
new file mode 100644
index 00000000..ac99477e
index 000000000..ac99477e9
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
@@ -0,0 +1,66 @@
@ -292,7 +292,7 @@ index 00000000..ac99477e
+}
diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
new file mode 100644
index 00000000..72e48e8e
index 000000000..72e48e8ef
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
@@ -0,0 +1,35 @@
@ -332,7 +332,7 @@ index 00000000..72e48e8e
+ }
+}
diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
index a850f078..9026e108 100644
index a850f0780..9026e108c 100644
--- a/src/main/java/org/bukkit/plugin/EventExecutor.java
+++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
@@ -5,9 +5,75 @@ import org.bukkit.event.EventException;
@ -412,7 +412,7 @@ index a850f078..9026e108 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 12601db6..06b6724f 100644
index 12601db68..06b6724fa 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -301,21 +301,7 @@ public final class JavaPluginLoader implements PluginLoader {

8
Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
View file

@ -1,4 +1,4 @@
From 20af2ff69a3f0159a59f104960b7b769cea9901f Mon Sep 17 00:00:00 2001
From 42992ea0a373658e8d49bac0fe96d13aab7128d9 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Thu, 21 Sep 2017 16:33:12 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging
@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through
several layers of logging abstraction.
diff --git a/pom.xml b/pom.xml
index a1dd0ac2..df8fc517 100644
index 709b7a222..5088c3315 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,6 +110,13 @@
@@ -109,6 +109,13 @@
<version>17.0.0</version>
<scope>provided</scope>
</dependency>
@ -32,7 +32,7 @@ index a1dd0ac2..df8fc517 100644
<dependency>
<groupId>junit</groupId>
diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
index febfec6e..79890c68 100644
index febfec6ef..79890c68f 100644
--- a/src/main/java/org/bukkit/plugin/Plugin.java
+++ b/src/main/java/org/bukkit/plugin/Plugin.java
@@ -166,6 +166,13 @@ public interface Plugin extends TabExecutor {