Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +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

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 {