Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b6cf80ee Preload important classes such as Logger and JLine
ea1a909c Fix netty version to 50 and restore epoll native support
10502558 Workaround for some hacky environments that mess up things
8b2a437b Fix plugins calling getChunkAtAsync asynchronously
c8055836 Update Netty to 4.1.51
64cfcf3e Optimize sending packets to nearby locations (sounds/effects)
This commit is contained in:
William Blake Galbreath
2020-05-24 18:26:13 -05:00
parent 3e808f90ec
commit 16eea718fa
8 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: cf82dad399...b6cf80ee66

2
current-paper
View File

@@ -1 +1 @@
1.15.2--4b2e1d61714587ba29125b8ceb75a8cbb6c65824
1.15.2--c8d74d65b138a5bcc1f4764d3a4902d819ebd376

12
patches/server/0001-Rebrand.patch
View File

@@ -1,4 +1,4 @@
From 11137688efbe226b4c00fd1e9e2a2a0796b0c025 Mon Sep 17 00:00:00 2001
From fad7117f1f0a960e444b059b3ef72357a008826e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand
@@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand
create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
diff --git a/pom.xml b/pom.xml
index 1ae57e8ab..7f251e739 100644
index e4c63bb76..d5709e670 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
@@ -75,7 +75,7 @@ index 1ae57e8ab..7f251e739 100644
<dependency>
<groupId>net.minecrell</groupId>
<artifactId>terminalconsoleappender</artifactId>
@@ -159,7 +173,7 @@
@@ -164,7 +178,7 @@
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
@@ -84,7 +84,7 @@ index 1ae57e8ab..7f251e739 100644
<defaultGoal>clean install</defaultGoal> <!-- Paper -->
<plugins>
<plugin>
@@ -167,7 +181,7 @@
@@ -172,7 +186,7 @@
<artifactId>gitdescribe-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
@@ -107,7 +107,7 @@ index cd6e25923..bb227bc0f 100644
);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3ec164785..92677b38b 100644
index 5b24de6d6..5cd342eda 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1559,7 +1559,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -254,7 +254,7 @@ index 894917c88..648dde01a 100644
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 549ba4d80..3c7cb4e3f 100644
index b58f2ef5c..fefa718df 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -306,7 +306,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

14
patches/server/0002-Purpur-config-files.patch
View File

@@ -1,4 +1,4 @@
From 376d9b7f6349b16f1f9b7cbf2d7e90c292064826 Mon Sep 17 00:00:00 2001
From 6e736c2a7977666d82fb9e69db0d05f1608b0b7f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:09:43 -0500
Subject: [PATCH] Purpur config files
@@ -18,10 +18,10 @@ Subject: [PATCH] Purpur config files
create mode 100644 src/main/java/net/pl3x/purpur/command/PurpurCommand.java
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index e257d6b36..a6cd76fa5 100644
index 24641501a..b767dd1d0 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -578,7 +578,7 @@ public class Metrics {
@@ -581,7 +581,7 @@ public class Metrics {
boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
// Only start Metrics, if it's enabled in the config
if (config.getBoolean("enabled", true)) {
@@ -30,7 +30,7 @@ index e257d6b36..a6cd76fa5 100644
metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
String minecraftVersion = Bukkit.getVersion();
@@ -587,8 +587,8 @@ public class Metrics {
@@ -590,8 +590,8 @@ public class Metrics {
}));
metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
@@ -62,7 +62,7 @@ index b07c49f1b..cf5abd393 100644
// Paper end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 508a3ed1e..d64d7b731 100644
index 561b42472..6ada23918 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -85,6 +85,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -80,7 +80,7 @@ index 508a3ed1e..d64d7b731 100644
+ this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig(worlddata.getName(), this.paperConfig, this.spigotConfig); // Purpur
this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
dimensionmanager.world = (WorldServer) this; // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644
index 000000000..333c880bf
@@ -411,7 +411,7 @@ index 648dde01a..64f1190b0 100644
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 93340e947..05e8da40f 100644
index ffee0c5dd..f4626daed 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -139,6 +139,14 @@ public class Main {

8
patches/server/0007-Ridables.patch
View File

@@ -1,4 +1,4 @@
From 03e8fc205943d49907e5d9604466408dc809681b Mon Sep 17 00:00:00 2001
From f5c5f87d9228f604fb30397a473cd410001f3fce Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables
@@ -5227,10 +5227,10 @@ index 0c7f094e5..62a081006 100644
return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d64d7b731..4c04e2120 100644
index 6ada23918..c3a862fea 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -994,6 +994,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -995,6 +995,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
}
@@ -5238,7 +5238,7 @@ index d64d7b731..4c04e2120 100644
public boolean a(AxisAlignedBB axisalignedbb, Material material) {
int i = MathHelper.floor(axisalignedbb.minX);
int j = MathHelper.f(axisalignedbb.maxX);
@@ -1629,4 +1630,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1630,4 +1631,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@Override public BiomeManager d() {
return this.biomeManager;
}

6
patches/server/0009-Disable-outdated-build-check.patch
View File

@@ -1,4 +1,4 @@
From 9f076b9cec808602cb65e0ed2324846ffacd6218 Mon Sep 17 00:00:00 2001
From e15515e1c1a6f10072bb7ac3a2636403eddb86dd Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 15 Dec 2019 12:53:59 -0600
Subject: [PATCH] Disable outdated build check
@@ -8,10 +8,10 @@ Subject: [PATCH] Disable outdated build check
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 05e8da40f..717c2759f 100644
index f4626daed..4b95b3c22 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -221,7 +221,7 @@ public class Main {
@@ -252,7 +252,7 @@ public class Main {
System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
}

8
patches/server/0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
View File

@@ -1,4 +1,4 @@
From d93cab923b90c3110303ddc0fa5639fa9bb766e9 Mon Sep 17 00:00:00 2001
From 6704cc0493c13354f0705204c67d2ba951253d6b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 01:42:50 -0500
Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4c04e2120..7356d794d 100644
index c3a862fea..ed7b85dc2 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1436,8 +1436,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1437,8 +1437,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
return blockposition;
}
@@ -25,7 +25,7 @@ index 4c04e2120..7356d794d 100644
public boolean a(EntityHuman entityhuman, BlockPosition blockposition) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 1524d0ed2..4ba2ec7df 100644
index 414fc4baf..e54cff571 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -384,12 +384,16 @@ public class CraftWorld implements World {

8
patches/server/0087-UPnP-Port-Forwarding-Service.patch
View File

@@ -1,4 +1,4 @@
From 176ac13ebc4fd1146e653cd6146f63a7f268a7bf Mon Sep 17 00:00:00 2001
From 3fbe26f37974416a29492fdb5d055a87e68eec9c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 22 Jan 2020 20:13:40 -0600
Subject: [PATCH] UPnP Port Forwarding Service
@@ -14,7 +14,7 @@ Subject: [PATCH] UPnP Port Forwarding Service
create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
diff --git a/pom.xml b/pom.xml
index 7f251e739..c1d87f951 100644
index d5709e670..43d6bed36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,12 @@
@@ -30,7 +30,7 @@ index 7f251e739..c1d87f951 100644
<!-- Purpur end -->
<dependency>
<groupId>net.minecrell</groupId>
@@ -162,6 +168,10 @@
@@ -167,6 +173,10 @@
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
@@ -78,7 +78,7 @@ index 73d2b32c5..a522ed5c3 100644
// this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up
server.loadPlugins();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 378fd60db..d00852a12 100644
index 303778dcd..03dc148ad 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -187,6 +187,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas