core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot) 

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
Show Stats 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);

16
Spigot-Server-Patches/0001-POM-Changes.patch
View File

@ -1,11 +1,11 @@
From ebaa3f2ecf523cfb023fba78355399fccb79a173 Mon Sep 17 00:00:00 2001
From 2a171fc9f9454717a70aa971a34cb26b8e532192 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:40:33 -0600
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index b423d5be5..713034015 100644
index 4304b622a..d1913a434 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,11 @@
@ -23,8 +23,8 @@ index b423d5be5..713034015 100644
+ <url>https://papermc.io</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -21,16 +20,16 @@
<skipTests>true</skipTests>
@@ -22,16 +21,16 @@
</properties>
<parent>
@ -45,7 +45,7 @@ index b423d5be5..713034015 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -95,34 +94,22 @@
@@ -96,34 +95,22 @@
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
@ -91,7 +91,7 @@ index b423d5be5..713034015 100644
</goals>
</execution>
</executions>
@@ -132,11 +119,13 @@
@@ -133,11 +120,13 @@
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
@ -106,7 +106,7 @@ index b423d5be5..713034015 100644
<Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor>
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-Version>
@@ -176,20 +165,23 @@
@@ -177,20 +166,23 @@
<goal>shade</goal>
</goals>
<configuration>
@ -138,7 +138,7 @@ index b423d5be5..713034015 100644
<relocation>
<pattern>org.bukkit.craftbukkit</pattern>
<shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
@@ -215,18 +207,6 @@
@@ -216,18 +208,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>

74
Spigot-Server-Patches/0009-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From a4ca9171fc5e2f0aca33ad73661a89e621796f78 Mon Sep 17 00:00:00 2001
From 3305cca437fb506e78cd2a486e9d2ed24786d7d0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
new file mode 100644
index 0000000000..66d02e048b
index 000000000..66d02e048
--- /dev/null
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -0,0 +1,132 @@
@ -144,7 +144,7 @@ index 0000000000..66d02e048b
+}
diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
new file mode 100644
index 0000000000..145cb274b0
index 000000000..145cb274b
--- /dev/null
+++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
@@ -0,0 +1,104 @@
@ -253,7 +253,7 @@ index 0000000000..145cb274b0
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 255b8bed0a..fe148495bf 100644
index 255b8bed0..fe148495b 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@ -297,7 +297,7 @@ index 255b8bed0a..fe148495bf 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index c09961be9b..dbf1089bac 100644
index c09961be9..dbf1089ba 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -22,6 +22,15 @@ public class Block implements IMaterial {
@ -317,7 +317,7 @@ index c09961be9b..dbf1089bac 100644
private final float frictionFactor;
protected final BlockStateList<Block, IBlockData> blockStateList;
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 23dee9b563..eca1284cc3 100644
index 23dee9b56..eca1284cc 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -854,6 +854,7 @@ public class Chunk implements IChunkAccess {
@ -337,7 +337,7 @@ index 23dee9b563..eca1284cc3 100644
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
index df2711a5f8..732c8793e5 100644
index df2711a5f..732c8793e 100644
--- a/src/main/java/net/minecraft/server/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/ChunkMap.java
@@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@ -357,7 +357,7 @@ index df2711a5f8..732c8793e5 100644
return chunk1;
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 0397ce610d..44c1dfe926 100644
index a8cdcb7da..eb83e20d5 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -88,7 +88,7 @@ public class ChunkProviderServer implements IChunkProvider {
@ -388,7 +388,7 @@ index 0397ce610d..44c1dfe926 100644
} else {
return null;
}
@@ -203,7 +202,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -206,7 +205,7 @@ public class ChunkProviderServer implements IChunkProvider {
}
public void saveChunk(IChunkAccess ichunkaccess, boolean unloaded) { // Spigot
@ -398,7 +398,7 @@ index 0397ce610d..44c1dfe926 100644
this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
} catch (IOException ioexception) {
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index e7ed234537..63533d2379 100644
index 8e5ce6c18..35976a26f 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -1,5 +1,6 @@
@ -408,7 +408,7 @@ index e7ed234537..63533d2379 100644
import com.google.common.collect.Maps;
import com.mojang.datafixers.DataFixTypes;
import com.mojang.datafixers.DataFixer;
@@ -666,7 +667,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -672,7 +673,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
public void loadEntities(NBTTagCompound nbttagcompound, Chunk chunk) {
NBTTagList nbttaglist = nbttagcompound.getList("Entities", 10);
World world = chunk.getWorld();
@ -417,7 +417,7 @@ index e7ed234537..63533d2379 100644
for (int i = 0; i < nbttaglist.size(); ++i) {
NBTTagCompound nbttagcompound1 = nbttaglist.getCompound(i);
@@ -675,8 +676,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -681,8 +682,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
chunk.f(true);
}
@ -426,7 +426,7 @@ index e7ed234537..63533d2379 100644
NBTTagList nbttaglist1 = nbttagcompound.getList("TileEntities", 10);
for (int j = 0; j < nbttaglist1.size(); ++j) {
@@ -693,8 +692,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -699,8 +698,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
}
}
@ -435,7 +435,7 @@ index e7ed234537..63533d2379 100644
if (nbttagcompound.hasKeyOfType("TileTicks", 9) && world.getBlockTickList() instanceof TickListServer) {
((TickListServer) world.getBlockTickList()).a(nbttagcompound.getList("TileTicks", 10));
@@ -703,7 +700,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -709,7 +706,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
if (nbttagcompound.hasKeyOfType("LiquidTicks", 9) && world.getFluidTickList() instanceof TickListServer) {
((TickListServer) world.getFluidTickList()).a(nbttagcompound.getList("LiquidTicks", 10));
}
@ -445,7 +445,7 @@ index e7ed234537..63533d2379 100644
}
diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
index 65574eb2e5..bc87cfc4b6 100644
index 65574eb2e..bc87cfc4b 100644
--- a/src/main/java/net/minecraft/server/CustomFunction.java
+++ b/src/main/java/net/minecraft/server/CustomFunction.java
@@ -12,12 +12,22 @@ public class CustomFunction {
@ -472,7 +472,7 @@ index 65574eb2e5..bc87cfc4b6 100644
return this.b;
}
diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
index f28f4f3cd3..6b417be1dd 100644
index f28f4f3cd..6b417be1d 100644
--- a/src/main/java/net/minecraft/server/CustomFunctionData.java
+++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
@@ -100,7 +100,7 @@ public class CustomFunctionData implements ITickable, IResourcePackListener {
@ -485,7 +485,7 @@ index f28f4f3cd3..6b417be1dd 100644
int j = 0;
CustomFunction.c[] acustomfunction_c = customfunction.b();
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 197d116c68..0ebada4902 100644
index 197d116c6..0ebada490 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
@ -538,7 +538,7 @@ index 197d116c68..0ebada4902 100644
return waitable.get();
} catch (java.util.concurrent.ExecutionException e) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 48ec5e0471..f36ab639f8 100644
index 48ec5e047..f36ab639f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -27,7 +27,8 @@ import org.bukkit.command.CommandSender;
@ -577,7 +577,7 @@ index 48ec5e0471..f36ab639f8 100644
protected float ab() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ed859ccf95..31bbbbd969 100644
index ed859ccf9..31bbbbd96 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -653,7 +653,7 @@ index ed859ccf95..31bbbbd969 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index cd462f7dfc..45ab33d1ae 100644
index cd462f7df..45ab33d1a 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -168,7 +168,7 @@ public class EntityTracker {
@ -684,7 +684,7 @@ index cd462f7dfc..45ab33d1ae 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 963c7e777c..edb1748fd8 100644
index 963c7e777..edb1748fd 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1,5 +1,6 @@
@ -837,7 +837,7 @@ index 963c7e777c..edb1748fd8 100644
this.methodProfiler.exit();
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index c24f4a8fea..e01222ad2b 100644
index c24f4a8fe..e01222ad2 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -1,5 +1,6 @@
@ -929,7 +929,7 @@ index c24f4a8fea..e01222ad2b 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f0e87416ec..723fce2049 100644
index f0e87416e..723fce204 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@ -984,7 +984,7 @@ index f0e87416ec..723fce2049 100644
// this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
index 6c88d0c86a..8bf94c1b96 100644
index 6c88d0c86..8bf94c1b9 100644
--- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
+++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
@@ -1,11 +1,17 @@
@ -1006,7 +1006,7 @@ index 6c88d0c86a..8bf94c1b96 100644
throw CancelledPacketHandleException.INSTANCE;
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 54e44cba35..3a83819d56 100644
index 54e44cba3..3a83819d5 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1,5 +1,6 @@
@ -1030,7 +1030,7 @@ index 54e44cba35..3a83819d56 100644
public WhiteList getWhitelist() {
diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
index 0da57948a3..6571fc5952 100644
index 0da57948a..6571fc595 100644
--- a/src/main/java/net/minecraft/server/TickListServer.java
+++ b/src/main/java/net/minecraft/server/TickListServer.java
@@ -24,13 +24,19 @@ public class TickListServer<T> implements TickList<T> {
@ -1084,7 +1084,7 @@ index 0da57948a3..6571fc5952 100644
}
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index c69209497b..68ac014aab 100644
index c69209497..68ac014aa 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@ -1104,7 +1104,7 @@ index c69209497b..68ac014aab 100644
private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5531f5205e..209091a9cb 100644
index 5531f5205..209091a9c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,6 @@
@ -1212,7 +1212,7 @@ index 5531f5205e..209091a9cb 100644
public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0a32a767e6..60939cc338 100644
index 0a32a767e..60939cc33 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1,5 +1,6 @@
@ -1314,7 +1314,7 @@ index 0a32a767e6..60939cc338 100644
// CraftBukkit start
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a3c07fbacc..da57751f73 100644
index a3c07fbac..da57751f7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1945,12 +1945,31 @@ public final class CraftServer implements Server {
@ -1351,7 +1351,7 @@ index a3c07fbacc..da57751f73 100644
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
deleted file mode 100644
index 2ab4b11a8d..0000000000
index 2ab4b11a8..000000000
--- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
+++ /dev/null
@@ -1,173 +0,0 @@
@ -1529,7 +1529,7 @@ index 2ab4b11a8d..0000000000
- }
-}
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
index 413dd35f06..52a8c48fa4 100644
index 413dd35f0..52a8c48fa 100644
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
@@ -1,6 +1,8 @@
@ -1565,7 +1565,7 @@ index 413dd35f06..52a8c48fa4 100644
public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 51f7cc31c9..704acf7386 100644
index 51f7cc31c..704acf738 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1695,6 +1695,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -1584,7 +1584,7 @@ index 51f7cc31c9..704acf7386 100644
public Player.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 2f5d7a2a63..311c4f5ca6 100644
index 2f5d7a2a6..311c4f5ca 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -15,6 +15,7 @@ import java.util.concurrent.atomic.AtomicReference;
@ -1651,7 +1651,7 @@ index 2f5d7a2a63..311c4f5ca6 100644
private boolean isReady(final int currentTick) {
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
index 3f55381c15..f32e660107 100644
index 3f55381c1..f32e66010 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
@@ -2,8 +2,8 @@ package org.bukkit.craftbukkit.scheduler;
@ -1733,7 +1733,7 @@ index 3f55381c15..f32e660107 100644
- // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
index e52ef47b78..3d90b34268 100644
index e52ef47b7..3d90b3426 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
@@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@ -1745,7 +1745,7 @@ index e52ef47b78..3d90b34268 100644
this.value = value;
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index c1071c92ee..a99c0cea0f 100644
index c1071c92e..a99c0cea0 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -30,7 +30,7 @@ import net.minecraft.server.EntityWither;

6
Spigot-Server-Patches/0028-Lighting-Queue.patch
View File

@ -1,4 +1,4 @@
From 55ff099f0d6ecf7d813d7951a9f590020b97d147 Mon Sep 17 00:00:00 2001
From faff1c8fca7561b10f61a8ab6edbb9610e027cac Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 2 Mar 2016 00:52:31 -0600
Subject: [PATCH] Lighting Queue
@ -126,10 +126,10 @@ index 0a436133a..2afd6befa 100644
IMMEDIATE, QUEUED, CHECK;
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 44c1dfe92..fe189a841 100644
index eb83e20d5..c2ecc034e 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -310,6 +310,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -313,6 +313,7 @@ public class ChunkProviderServer implements IChunkProvider {
return false;
}
save = event.isSaveChunk();

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

@ -1,4 +1,4 @@
From b9f5bd730d327e08bd8a8100c7e939f7e8d03714 Mon Sep 17 00:00:00 2001
From 4940a8baeda8ba8af4dd674cd62ed6cf41e3cb07 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 03:15:41 -0600
Subject: [PATCH] Add exception reporting event
@ -88,7 +88,7 @@ index d1b6344ce..446e464b7 100644
}
}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index fe189a841..9a8894238 100644
index c2ecc034e..1ed7c7e2c 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -13,6 +13,7 @@ import java.util.concurrent.CompletableFuture;
@ -99,7 +99,7 @@ index fe189a841..9a8894238 100644
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -206,9 +207,16 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -209,9 +210,16 @@ public class ChunkProviderServer implements IChunkProvider {
ichunkaccess.setLastSaved(this.world.getTime());
this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
} catch (IOException ioexception) {

20
Spigot-Server-Patches/0061-Chunk-save-queue-improvements.patch
View File

@ -1,4 +1,4 @@
From 509516752bce9e1f9a8e0eb8f0d94d11b4ff841c Mon Sep 17 00:00:00 2001
From 2eb12d8fcb6b1715e3583e9b3333f5032a7b240d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 4 Mar 2016 18:18:37 -0600
Subject: [PATCH] Chunk save queue improvements
@ -53,7 +53,7 @@ index b0c004b1f..d2cece265 100644
return a(this.x, this.z);
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 63533d237..c0785eea0 100644
index 35976a26f..21ee154a5 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -20,6 +20,7 @@ import java.util.Map.Entry;
@ -94,16 +94,16 @@ index 63533d237..c0785eea0 100644
private final File c;
private final DataFixer d;
private PersistentStructureLegacy e;
@@ -80,7 +101,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@Nullable
private NBTTagCompound a(DimensionManager dimensionmanager, @Nullable PersistentCollection persistentcollection, int i, int j, @Nullable GeneratorAccess generatoraccess) throws IOException {
@@ -86,7 +107,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
return null;
}
// CraftBukkit end
- NBTTagCompound nbttagcompound = SupplierUtils.getIfExists(this.b.get(new ChunkCoordIntPair(i, j))); // Spigot
+ NBTTagCompound nbttagcompound = SupplierUtils.getIfExists(this.saveMap.get(ChunkCoordIntPair.asLong(i, j))); // Spigot // Paper
if (nbttagcompound != null) {
return nbttagcompound;
@@ -308,7 +329,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -314,7 +335,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
};
}
@ -112,7 +112,7 @@ index 63533d237..c0785eea0 100644
// Spigot end
} catch (Exception exception) {
ChunkRegionLoader.a.error("Failed to save chunk", exception);
@@ -317,7 +338,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -323,7 +344,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
protected void a(ChunkCoordIntPair chunkcoordintpair, Supplier<NBTTagCompound> nbttagcompound) { // Spigot
@ -122,7 +122,7 @@ index 63533d237..c0785eea0 100644
FileIOThread.a().a(this);
}
@@ -327,20 +349,24 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -333,20 +355,24 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
private boolean processSaveQueueEntry(boolean logCompletion) {
@ -155,7 +155,7 @@ index 63533d237..c0785eea0 100644
if (nbttagcompound == null) {
return true;
@@ -349,6 +375,15 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -355,6 +381,15 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
// CraftBukkit start
RegionFileCache.write(this.c, chunkcoordintpair.x, chunkcoordintpair.z, SupplierUtils.getIfExists(nbttagcompound)); // Spigot

10
Spigot-Server-Patches/0078-Optimize-Chunk-Access.patch
View File

@ -1,4 +1,4 @@
From 980387d44ae6392de1394b8fc6ca2579488f103a Mon Sep 17 00:00:00 2001
From ce3c5c8ec8d6bf991d2d9231bf949ea2157e1f65 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 27 Aug 2015 01:15:02 -0400
Subject: [PATCH] Optimize Chunk Access
@ -71,7 +71,7 @@ index 732c8793e..8b3738c8f 100644
public Chunk remove(Object object) {
return this.remove((Long) object);
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 9a8894238..fd68f06fe 100644
index 1ed7c7e2c..c54df4583 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -76,15 +76,16 @@ public class ChunkProviderServer implements IChunkProvider {
@ -94,7 +94,7 @@ index 9a8894238..fd68f06fe 100644
return chunk;
}
@@ -195,7 +196,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -198,7 +199,7 @@ public class ChunkProviderServer implements IChunkProvider {
}
this.chunks.put(k, chunk);
@ -103,7 +103,7 @@ index 9a8894238..fd68f06fe 100644
}
this.asyncTaskHandler.postToMainThread(chunk::addEntities);
@@ -341,7 +342,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -344,7 +345,7 @@ public class ChunkProviderServer implements IChunkProvider {
this.saveChunk(chunk, true); // Spigot
}
this.chunks.remove(chunk.chunkKey);
@ -112,7 +112,7 @@ index 9a8894238..fd68f06fe 100644
}
return true;
}
@@ -377,6 +378,6 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -380,6 +381,6 @@ public class ChunkProviderServer implements IChunkProvider {
}
public boolean isLoaded(int i, int j) {

6
Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
View File

@ -1,4 +1,4 @@
From b8e43d91f2413961dbec06e5545224fce3aade80 Mon Sep 17 00:00:00 2001
From e9a7436242095e39bf7c216ead3291c98cb26689 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 18 Jun 2016 23:22:12 -0400
Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@ -75,10 +75,10 @@ index 8b3738c8f..2021c0d02 100644
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index fd68f06fe..ff6f7596c 100644
index c54df4583..d0bf0f72d 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -304,6 +304,19 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -307,6 +307,19 @@ public class ChunkProviderServer implements IChunkProvider {
}
activityAccountant.endActivity(); // Spigot
}

6
Spigot-Server-Patches/0124-Fix-Double-World-Add-issues.patch
View File

@ -1,4 +1,4 @@
From ad615dea2d04464cdc2f32a7a7cf5b7ffdf3ca20 Mon Sep 17 00:00:00 2001
From f7df7852a2bdeeb3e9ada8245312285e17151d2d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 21 Jun 2016 22:54:34 -0400
Subject: [PATCH] Fix Double World Add issues
@ -8,10 +8,10 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
Also add debug if something else tries to, and abort before world gets bad state
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index c0785eea0..030461026 100644
index 21ee154a5..a144118f6 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -1035,7 +1035,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -1041,7 +1041,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
public static void a(Entity entity, GeneratorAccess generatoraccess, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {

8
Spigot-Server-Patches/0135-Auto-Save-Improvements.patch
View File

@ -1,4 +1,4 @@
From 8d8d26a043ca64b9af562833a593222b20caec71 Mon Sep 17 00:00:00 2001
From daf61104fe9b89e99ced6b25f724fcaff2409ed6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 19 Sep 2016 23:16:39 -0400
Subject: [PATCH] Auto Save Improvements
@ -96,10 +96,10 @@ index ddccdc939..0d70ce797 100644
public boolean isEmpty() {
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index ff6f7596c..91533f8ac 100644
index d0bf0f72d..fbc69b5ba 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -240,7 +240,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -243,7 +243,7 @@ public class ChunkProviderServer implements IChunkProvider {
this.saveChunk(chunk, false); // Spigot
chunk.a(false);
++i;
@ -168,7 +168,7 @@ index 7710962ce..f09d358e2 100644
this.methodProfiler.enter("snooper");
if (getSnooperEnabled() && !this.snooper.d() && this.ticks > 100) { // Spigot
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 86aa0c57a..2c3ed3723 100644
index 79641a73a..fe6649224 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -341,6 +341,7 @@ public abstract class PlayerList {

10
Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch
View File

@ -1,4 +1,4 @@
From 008135e17f9a4a70e8cbc0593fd9c9cdfebd8f0a Mon Sep 17 00:00:00 2001
From 0bf2e8f130c7966e8d6ebf91cebee3a747aed8cd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Nov 2016 21:52:22 -0400
Subject: [PATCH] Prevent Auto Save if Save Queue is full
@ -23,10 +23,10 @@ index e8417cb2e..de59f4ce0 100644
private void removeCorruptTEs() {
removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 91533f8ac..8e4c1b39a 100644
index fbc69b5ba..9b5908a5b 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -233,6 +233,13 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -236,6 +236,13 @@ public class ChunkProviderServer implements IChunkProvider {
synchronized (this.chunkLoader) {
ObjectIterator objectiterator = this.chunks.values().iterator();
@ -41,10 +41,10 @@ index 91533f8ac..8e4c1b39a 100644
Chunk chunk = (Chunk) objectiterator.next();
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 030461026..6909b9e45 100644
index a144118f6..adfb5d056 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -150,6 +150,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -156,6 +156,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}

14
Spigot-Server-Patches/0144-Chunk-Save-Stats-Debug-Option.patch
View File

@ -1,4 +1,4 @@
From 946777dc075869f97b5854d4953ec402cdb3a194 Mon Sep 17 00:00:00 2001
From fa2b0c5fa02d4b14d6efaed6d377ba7366964ca8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 4 Nov 2016 02:12:10 -0400
Subject: [PATCH] Chunk Save Stats Debug Option
@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
Stats on current queue, how many was processed and how many were queued.
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 8e4c1b39a..ed747bc3c 100644
index 9b5908a5b..299776728 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -28,6 +28,11 @@ public class ChunkProviderServer implements IChunkProvider {
@ -23,7 +23,7 @@ index 8e4c1b39a..ed747bc3c 100644
public final Long2ObjectMap<Chunk> chunks = Long2ObjectMaps.synchronize(new ChunkMap(8192));
private Chunk lastChunk;
private final ChunkTaskScheduler chunkScheduler;
@@ -236,6 +241,29 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -239,6 +244,29 @@ public class ChunkProviderServer implements IChunkProvider {
// Paper start
final ChunkRegionLoader chunkLoader = (ChunkRegionLoader) world.getChunkProvider().chunkLoader;
final int queueSize = chunkLoader.getQueueSize();
@ -54,10 +54,10 @@ index 8e4c1b39a..ed747bc3c 100644
return false;
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 6909b9e45..48230251d 100644
index adfb5d056..0fc4d9f52 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -150,7 +150,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -156,7 +156,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
@ -72,7 +72,7 @@ index 6909b9e45..48230251d 100644
// CraftBukkit start - Add async variant, provide compatibility
@Nullable
@@ -342,6 +348,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -348,6 +354,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
protected void a(ChunkCoordIntPair chunkcoordintpair, Supplier<NBTTagCompound> nbttagcompound) { // Spigot
this.saveMap.put(chunkcoordintpair.asLong(), nbttagcompound); // Paper
queue.add(new QueuedChunk(chunkcoordintpair, nbttagcompound)); // Paper - Chunk queue improvements
@ -80,7 +80,7 @@ index 6909b9e45..48230251d 100644
FileIOThread.a().a(this);
}
@@ -369,6 +376,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -375,6 +382,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
// Paper end
ChunkCoordIntPair chunkcoordintpair = chunk.coords; // Paper - Chunk queue improvements
Supplier<NBTTagCompound> nbttagcompound = chunk.compoundSupplier; // Spigot // Paper

6
Spigot-Server-Patches/0172-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
View File

@ -1,14 +1,14 @@
From 8ed4562f4c90cc4a92c78531f3f207992f5c4213 Mon Sep 17 00:00:00 2001
From 241fe427ab94754bd7f745cf4b9acb07a5a91aa9 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 7 Feb 2017 16:55:35 -0600
Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index ed747bc3c..f7c433b94 100644
index 299776728..41926a361 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -310,7 +310,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -313,7 +313,7 @@ public class ChunkProviderServer implements IChunkProvider {
// Spigot start
org.spigotmc.SlackActivityAccountant activityAccountant = this.world.getMinecraftServer().slackActivityAccountant;
activityAccountant.startActivity(0.5);

10
Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch
View File

@ -1,4 +1,4 @@
From 38782ceaec1fc62dbce6fc63a0ff8c20886c2928 Mon Sep 17 00:00:00 2001
From 13a089dda417c02ad24a9f7beb9fe49e224c1738 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 9 Jun 2017 19:03:43 +0200
Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@ -19,10 +19,10 @@ Other changes:
configuration
diff --git a/pom.xml b/pom.xml
index 713034015..b1d860a75 100644
index d1913a434..1512ff969 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,10 +40,27 @@
@@ -41,10 +41,27 @@
<scope>compile</scope>
</dependency>
<dependency>
@ -54,7 +54,7 @@ index 713034015..b1d860a75 100644
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
@@ -198,10 +215,18 @@
@@ -199,10 +216,18 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/java.sql.Driver</resource>
</transformer>
@ -243,7 +243,7 @@ index f2c172ff1..3b918da4d 100644
public KeyPair E() {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index fe2f13aef..07e25ce1d 100644
index 9d44dcb3b..8bb3fef21 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -77,8 +77,7 @@ public abstract class PlayerList {

10
Spigot-Server-Patches/0202-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
View File

@ -1,4 +1,4 @@
From c4e09d0639b742ae0ac2e4a0ccec89eb9f34cf16 Mon Sep 17 00:00:00 2001
From 10515690ebe575594d71dc39cd76069716e6b5c9 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Mon, 18 Sep 2017 12:00:03 +0200
Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@ -12,10 +12,10 @@ results in a separate line, even though it should not result in
a line break. Log4j's implementation handles it correctly.
diff --git a/pom.xml b/pom.xml
index ea08d7d98..f34ca2285 100644
index 1512ff969..f861eda9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,11 @@
@@ -63,6 +63,11 @@
<version>2.8.1</version>
<scope>runtime</scope>
</dependency>
@ -28,7 +28,7 @@ index ea08d7d98..f34ca2285 100644
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 908127630..fb9db65ee 100644
index be7030d56..71d1c0b25 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -131,8 +131,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -45,5 +45,5 @@ index 908127630..fb9db65ee 100644
thread.setDaemon(true);
--
2.20.0
2.20.1

6
Spigot-Server-Patches/0203-Handle-plugin-prefixes-using-Log4J-configuration.patch
View File

@ -1,4 +1,4 @@
From 254f000eeb860e7d9f988b3d332a0be70a1c0aa4 Mon Sep 17 00:00:00 2001
From c94d3bd0e5d19a9cc1575e38f750f8ee750dc951 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Thu, 21 Sep 2017 16:14:55 +0200
Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@ -15,10 +15,10 @@ This may cause additional prefixes to be disabled for plugins bypassing
the plugin logger.
diff --git a/pom.xml b/pom.xml
index 73237ae8e..33ccbaea7 100644
index f861eda9d..ed6cd4416 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
@@ -61,7 +61,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.8.1</version>

8
Spigot-Server-Patches/0204-Include-Log4J2-SLF4J-implementation.patch
View File

@ -1,14 +1,14 @@
From 5059a539b473c09efe4b060eb59f100b935d1dba Mon Sep 17 00:00:00 2001
From 0a0de210e103b80fd30452bb7312732d35cb96d1 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Thu, 21 Sep 2017 16:33:35 +0200
Subject: [PATCH] Include Log4J2 SLF4J implementation
diff --git a/pom.xml b/pom.xml
index 70966a76a..f4dcd8564 100644
index ed6cd4416..75f98f79a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,12 @@
@@ -63,6 +63,12 @@
<version>2.8.1</version>
<scope>compile</scope>
</dependency>
@ -22,5 +22,5 @@ index 70966a76a..f4dcd8564 100644
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-iostreams</artifactId>
--
2.20.0
2.20.1

6
Spigot-Server-Patches/0289-Use-asynchronous-Log4j-2-loggers.patch
View File

@ -1,14 +1,14 @@
From 72ec2db42dcc489106778c2daacaee412cd9aece Mon Sep 17 00:00:00 2001
From d0bd2562792c056e7d3b8088367512443c3a26f8 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 17 Jul 2018 16:42:17 +0200
Subject: [PATCH] Use asynchronous Log4j 2 loggers
diff --git a/pom.xml b/pom.xml
index f4dcd8564..282410a22 100644
index 75f98f79a..57042c171 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,13 @@
@@ -74,6 +74,13 @@
<artifactId>log4j-iostreams</artifactId>
<version>2.8.1</version>
</dependency>

6
Spigot-Server-Patches/0297-Don-t-save-Proto-Chunks.patch
View File

@ -1,4 +1,4 @@
From 7fa718550cc7347b5daafb23d3e246f3460e7557 Mon Sep 17 00:00:00 2001
From c9fb380ad89cac03569265033dd78a7cb0af754f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 22 Jul 2018 21:21:41 -0400
Subject: [PATCH] Don't save Proto Chunks
@ -8,10 +8,10 @@ the loadChunk method refuses to acknoledge they exists, and will restart
a new chunk generation process to begin with, so saving them serves no benefit.
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 48230251d..4d619eb4c 100644
index 0fc4d9f52..2c4a4fc6b 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -298,6 +298,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -304,6 +304,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
public void saveChunk(World world, IChunkAccess ichunkaccess, boolean unloaded) throws IOException, ExceptionWorldConflict {

8
Spigot-Server-Patches/0306-Prevent-Saving-Bad-entities-to-chunks.patch
View File

@ -1,4 +1,4 @@
From 1f19a5ad7d76ab730f70a476f397eab9c0e33a30 Mon Sep 17 00:00:00 2001
From da5c171c54cc1df931c2b505b1d05bafb0ad26f3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 26 Jul 2018 00:11:12 -0400
Subject: [PATCH] Prevent Saving Bad entities to chunks
@ -18,10 +18,10 @@ an invalid entity.
This should reduce log occurrences of dupe uuid messages.
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 4d619eb4c..8d7309bb0 100644
index 2c4a4fc6b..485bce987 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -561,11 +561,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -567,11 +567,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
Iterator iterator;
@ -44,7 +44,7 @@ index 4d619eb4c..8d7309bb0 100644
NBTTagCompound nbttagcompound1 = new NBTTagCompound();
if (entity.d(nbttagcompound1)) {
@@ -574,6 +585,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -580,6 +591,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
}
}

16
Spigot-Server-Patches/0310-Provide-option-to-use-a-versioned-world-folder-for-t.patch
View File

@ -1,4 +1,4 @@
From 8222de7ca5f4e939f901f04d36d4107fba3e2e8e Mon Sep 17 00:00:00 2001
From 3e31184a36f550f8b89aba7879c6d92fd8871624 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 29 Jul 2018 15:48:50 -0400
Subject: [PATCH] Provide option to use a versioned world folder for testing
@ -59,12 +59,12 @@ index 48b0a742a..f0b87972d 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 8d7309bb0..450c9e79b 100644
index 485bce987..829cc9ed8 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -57,8 +57,55 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
private PersistentStructureLegacy e;
@@ -58,8 +58,55 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
// private boolean f; // CraftBukkit
public final LongSet blacklist = new LongOpenHashSet();
private static final double SAVE_QUEUE_TARGET_SIZE = 625; // Spigot
+ // Paper start - support saving to an alternate directory
+ private final File templateWorld;
@ -118,7 +118,7 @@ index 8d7309bb0..450c9e79b 100644
this.c = file;
this.d = datafixer;
}
@@ -96,11 +143,18 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -97,7 +144,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
public boolean chunkExists(int x, int z) {
@ -133,8 +133,12 @@ index 8d7309bb0..450c9e79b 100644
}
@Nullable
private NBTTagCompound a(DimensionManager dimensionmanager, @Nullable PersistentCollection persistentcollection, int i, int j, @Nullable GeneratorAccess generatoraccess) throws IOException {
@@ -107,6 +160,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
return null;
}
// CraftBukkit end
+ copyIfNeeded(i, j); // Paper
+
NBTTagCompound nbttagcompound = SupplierUtils.getIfExists(this.saveMap.get(ChunkCoordIntPair.asLong(i, j))); // Spigot // Paper
if (nbttagcompound != null) {

8
Spigot-Server-Patches/0338-Anti-Xray.patch
View File

@ -1,4 +1,4 @@
From e4cfb81f94284476cfcc5029fb1dde2fbe1af3d5 Mon Sep 17 00:00:00 2001
From 8d82fb498c5cf89a1a40ee1c8066ad25caec3375 Mon Sep 17 00:00:00 2001
From: stonar96 <minecraft.stonar96@gmail.com>
Date: Mon, 20 Aug 2018 03:03:58 +0200
Subject: [PATCH] Anti-Xray
@ -1071,10 +1071,10 @@ index edf4d9130..71d865b76 100644
this.initLighting();
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 450c9e79b..f3e766967 100644
index 829cc9ed8..18c06d3c8 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -842,7 +842,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -849,7 +849,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
ChunkConverter chunkconverter = nbttagcompound.hasKeyOfType("UpgradeData", 10) ? new ChunkConverter(nbttagcompound.getCompound("UpgradeData")) : ChunkConverter.a;
@ -1083,7 +1083,7 @@ index 450c9e79b..f3e766967 100644
protochunk.a(abiomebase);
protochunk.b(nbttagcompound.getLong("InhabitedTime"));
@@ -948,7 +948,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -955,7 +955,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
for (int i = 0; i < nbttaglist.size(); ++i) {
NBTTagCompound nbttagcompound = nbttaglist.getCompound(i);
byte b0 = nbttagcompound.getByte("Y");

6
Spigot-Server-Patches/0344-Optimize-getChunkIfLoaded-type-calls.patch
View File

@ -1,4 +1,4 @@
From cb4fba79d8fc1806c9b87c7145aff6dc957abd59 Mon Sep 17 00:00:00 2001
From 1fcbcf080609ed885aae4b8b4d0173f01b5bf33b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 29 Aug 2018 21:59:22 -0400
Subject: [PATCH] Optimize getChunkIfLoaded type calls
@ -10,10 +10,10 @@ Will improve inlining across many hot methods.
Improve getBrightness to not do double chunk map lookups.
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index f7c433b94..fce3f673d 100644
index 41926a361..186cfda7e 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -376,7 +376,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -379,7 +379,7 @@ public class ChunkProviderServer implements IChunkProvider {
continue;
}

16
Spigot-Server-Patches/0367-Async-Chunk-Loading-and-Generation.patch
View File

@ -1,4 +1,4 @@
From 55bd6cb4935cb50631475b9310371d147dec6ebd Mon Sep 17 00:00:00 2001
From 275e0ccf901515a273c3014d29fa86a2191dfbc9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 21 Jul 2018 16:55:04 -0400
Subject: [PATCH] Async Chunk Loading and Generation
@ -562,7 +562,7 @@ index 2021c0d02..154ab09e0 100644
public void putAll(Map<? extends Long, ? extends Chunk> map) {
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index fce3f673d..7b460d7dd 100644
index 186cfda7e..9cdeb3bfc 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -33,12 +33,12 @@ public class ChunkProviderServer implements IChunkProvider {
@ -677,7 +677,7 @@ index fce3f673d..7b460d7dd 100644
if (flag) {
try (co.aikar.timings.Timing timing = world.timings.syncChunkLoadTimer.startTiming()) { // Paper
@@ -147,7 +215,8 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -150,7 +218,8 @@ public class ChunkProviderServer implements IChunkProvider {
return (IChunkAccess) (chunk != null ? chunk : (IChunkAccess) this.chunkScheduler.b(new ChunkCoordIntPair(i, j), flag));
}
@ -687,7 +687,7 @@ index fce3f673d..7b460d7dd 100644
this.batchScheduler.b();
Iterator iterator = iterable.iterator();
@@ -165,6 +234,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -168,6 +237,7 @@ public class ChunkProviderServer implements IChunkProvider {
return this.batchScheduler.c();
}
@ -695,7 +695,7 @@ index fce3f673d..7b460d7dd 100644
private ReportedException a(int i, int j, Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Exception generating new chunk");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Chunk to be generated");
@@ -286,11 +356,13 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -289,11 +359,13 @@ public class ChunkProviderServer implements IChunkProvider {
}
public void close() {
@ -712,10 +712,10 @@ index fce3f673d..7b460d7dd 100644
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index f3e766967..c70308198 100644
index 18c06d3c8..5e00ca869 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -118,7 +118,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -119,7 +119,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
// CraftBukkit start
private boolean check(ChunkProviderServer cps, int x, int z) throws IOException {
if (cps != null) {
@ -724,7 +724,7 @@ index f3e766967..c70308198 100644
if (cps.isLoaded(x, z)) {
return true;
}
@@ -378,11 +378,12 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -385,11 +385,12 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
};
} else {

2
work/Bukkit

@ -1 +1 @@
Subproject commit 6ffe5a68d1cddf647e11344bc4fabad0f20757c0
Subproject commit 79f6ba259c9cd7f19c33befe611f2d5bbbe6d75b

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 917411fd80bb82d61b09965d87a878d58ca0b3a5
Subproject commit 7560d3b5ab2e8f09d1415d9945b9a3cdded08352

2
work/Spigot

@ -1 +1 @@
Subproject commit 518206a1d250cdc7ae6448383ea9063f69c766c4
Subproject commit 8173d06f799b09d24010fdeeac19f6e376101cab