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

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
79f6ba25 Skip tests on default builds
b85cc32f Further discourage World.regenerateChunk

CraftBukkit Changes:
7560d3b5 Skip tests on default builds
d0a9130d SPIGOT-4563: Fix regenerating chunks saved to disk already

Spigot Changes:
8173d06f Remove need for redundant second clone of repositories
8ede0393 Rebuild patches
This commit is contained in:
Shane Freeder 2019-01-04 19:19:36 +00:00
parent ccbeb5c4ed
commit b9badbf2bc
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
36 changed files with 192 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,14 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From 30eff11643ca14a7af5de155c42d30dff1f5a1bf 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 7ac07ac07ac0..7ac07ac07ac0 100644
index ebcc781c..229fe559 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,37 +3,36 @@
@@ -3,38 +3,37 @@
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>
@ -31,8 +31,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
<description>An enhanced plugin API for Minecraft servers.</description>
<properties>
- <skipTests>true</skipTests>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
+ <!-- Paper - #Logic -->
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
@ -62,7 +64,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
</repositories>
<pluginRepositories>
@@ -56,6 +55,13 @@
@@ -57,6 +56,13 @@
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
@ -76,7 +78,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -100,15 +106,12 @@
@@ -101,15 +107,12 @@
</dependencies>
<build>
@ -93,7 +95,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
@@ -143,40 +146,11 @@
@@ -144,6 +147,7 @@
</execution>
</executions>
<configuration>
@ -101,40 +103,6 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
<!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>development</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.17</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
--
2.19.1
2.20.1

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

@ -1,4 +1,4 @@
From 521b96be311beaf8b128080046c1140c3d910c61 Mon Sep 17 00:00:00 2001
From 82f0740953bd81ddf86eff39d3bfba0aa4163cf2 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 2a5846a18..b5cc156cd 100644
index 229fe559..412a6901 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,12 @@
@@ -44,6 +44,12 @@
</pluginRepositories>
<dependencies>
@ -23,5 +23,5 @@ index 2a5846a18..b5cc156cd 100644
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
--
2.19.0
2.20.1

6
Spigot-API-Patches/0021-Use-ASM-for-event-executors.patch
View file

@ -1,4 +1,4 @@
From 8782eb89fab27baa72cbe2b29684a49efadbd5af Mon Sep 17 00:00:00 2001
From bb0950fa863a7f52e3217d936719224d650e224f 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 f9fbc40a..1d42d42a 100644
index 412a6901..041ae474 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,6 +109,17 @@
@@ -110,6 +110,17 @@
<version>1.3</version>
<scope>test</scope>
</dependency>

20
Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
View file

@ -1,4 +1,4 @@
From d68ce4cd3ab1df5186f60a74440b14b396b82d40 Mon Sep 17 00:00:00 2001
From e794550eeff1ff454e3507e15e356a6970004b5a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 10 Jun 2017 16:59:40 -0500
Subject: [PATCH] Fix upstream javadoc warnings and errors
@ -21,10 +21,10 @@ index 43239f84..fe8d3468 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 6ce38e03..e66caa41 100644
index 013df5f8..14d1983a 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1603,6 +1603,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1604,6 +1604,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -32,7 +32,7 @@ index 6ce38e03..e66caa41 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, T data);
@@ -1618,6 +1619,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1619,6 +1620,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -40,7 +40,7 @@ index 6ce38e03..e66caa41 100644
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
@@ -1667,6 +1669,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1668,6 +1670,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -48,7 +48,7 @@ index 6ce38e03..e66caa41 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1686,6 +1689,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1687,6 +1690,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -56,7 +56,7 @@ index 6ce38e03..e66caa41 100644
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1741,6 +1745,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1742,6 +1746,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -64,7 +64,7 @@ index 6ce38e03..e66caa41 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@@ -1762,6 +1767,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1763,6 +1768,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -72,7 +72,7 @@ index 6ce38e03..e66caa41 100644
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@@ -1784,6 +1790,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1785,6 +1791,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param force whether to send the particle to players within an extended
* range and encourage their client to render it regardless of
* settings
@ -80,7 +80,7 @@ index 6ce38e03..e66caa41 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force);
@@ -1808,6 +1815,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1809,6 +1816,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param force whether to send the particle to players within an extended
* range and encourage their client to render it regardless of
* settings

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

@ -1,4 +1,4 @@
From 2ea958ba37dce96fec2e891b14c3435f5e819be9 Mon Sep 17 00:00:00 2001
From 9ac71cdcf1de81731a46bd1f0aabac54498a6a06 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 7ca5363b3..5fd948719 100644
index 041ae474..3e2c1cd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,14 @@
@@ -97,6 +97,14 @@
<scope>compile</scope>
</dependency>
@ -33,7 +33,7 @@ index 7ca5363b3..5fd948719 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 55debf5d5..8d2999ace 100644
index 55debf5d..8d2999ac 100644
--- a/src/main/java/org/bukkit/plugin/Plugin.java
+++ b/src/main/java/org/bukkit/plugin/Plugin.java
@@ -157,6 +157,12 @@ public interface Plugin extends TabExecutor {
@ -50,5 +50,5 @@ index 55debf5d5..8d2999ace 100644
* Returns the name of the plugin.
* <p>
--
2.19.0
2.20.1

6
Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
View file

@ -1,4 +1,4 @@
From 5daba95426cb5d3ab09db50d25acc35aac87bcf0 Mon Sep 17 00:00:00 2001
From e32d00e63c653173ca88ee153f4b38d474ebc117 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 17:55:28 -0400
Subject: [PATCH] Additional world.getNearbyEntities API's
@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
Provides more methods to get nearby entities, and filter by types and predicates
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index e66caa41..d9010176 100644
index 14d1983a..1dccdad5 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2,6 +2,8 @@ package org.bukkit;
@ -18,7 +18,7 @@ index e66caa41..d9010176 100644
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -480,6 +482,238 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -481,6 +483,238 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public Collection<Entity> getEntitiesByClasses(Class<?>... classes);

6
Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
View file

@ -1,4 +1,4 @@
From 56c0296c4c259c68f03a2e35acc9e39501046e95 Mon Sep 17 00:00:00 2001
From 087ea8fe096e32f8404d94d41d759a593365bd5e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 29 Aug 2017 23:58:48 -0400
Subject: [PATCH] Expand World.spawnParticle API and add Builder
@ -452,10 +452,10 @@ index 4d0acaf5..827aa00c 100644
* Options which can be applied to redstone dust particles - a particle
* color and size.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index d9010176..379fd2fa 100644
index 1dccdad5..926cb61f 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2003,7 +2003,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2004,7 +2004,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
* the type of this depends on {@link Particle#getDataType()}
* @param <T> Type
*/

6
Spigot-API-Patches/0112-Expand-Explosions-API.patch
View file

@ -1,4 +1,4 @@
From 469a7079d60dae81be5b7752cd439756a62718b7 Mon Sep 17 00:00:00 2001
From a53c306b2523a763f792cfd88668cb6047265cd9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 16:24:42 -0500
Subject: [PATCH] Expand Explosions API
@ -98,10 +98,10 @@ index 162a76e8..056a4d6b 100644
@Override
public boolean equals(Object obj) {
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 379fd2fa..70e7c9e3 100644
index 926cb61f..b008c280 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1148,6 +1148,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1149,6 +1149,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean createExplosion(Location loc, float power, boolean setFire);

6
Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch
View file

@ -1,14 +1,14 @@
From 203c520625cc337506bde2c144f1dda95231a000 Mon Sep 17 00:00:00 2001
From 148138b4f5639ec234c022057eeb0f6c50e21a1c Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 3 Jul 2018 16:07:16 +0200
Subject: [PATCH] Add World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 70e7c9e3..301d9418 100644
index b008c280..b836459b 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -738,6 +738,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -739,6 +739,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public Collection<Entity> getNearbyEntities(Location location, double x, double y, double z);

6
Spigot-API-Patches/0159-Add-sun-related-API.patch
View file

@ -1,14 +1,14 @@
From 57018093cd49e64641888299c3c0645fe7d157e3 Mon Sep 17 00:00:00 2001
From cacc745bfa3a5223ae5468436ed59a6d007ea9dd Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Oct 2018 00:54:15 -0500
Subject: [PATCH] Add sun related API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 668c9b7a..67e062b8 100644
index 482c6080..02d4afd7 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1446,6 +1446,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1447,6 +1447,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public void setFullTime(long time);