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:
f6f9157b Don't toString block unless actually showing the message
b3f0527a Add Spawn Entity SpawnReason API
ec8d7387 MC-183249: Don't generate Carving Masks BitSet unless needed
2d401d2d Improve BlockPosition hashCode/equals
2572bd01 Fix world unload toLowercase - Fixes #3326
dda9680b Optimize brigadier child sorting performance
a71a4ec2 Fix CraftServer.unloadWorld Leak
This commit is contained in:
William Blake Galbreath
2020-05-09 13:18:38 -05:00
parent 3ce3644645
commit 833bd1cc47
9 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: f6fc0d4cd4...f6f9157bd4

2
current-paper
View File

@@ -1 +1 @@
1.15.2--b598f12386dada5b9548b68462561ff56177fbd3
1.15.2--b3418d8100f75e8b30b24931e91b5446f7d259f1

8
patches/api/0019-Add-moon-phase-API.patch
View File

@@ -1,4 +1,4 @@
From f7117483a092158d2028933b04c54d53a637b7b8 Mon Sep 17 00:00:00 2001
From 8876f5bd26cacef6a6849fb2c95a5118742c40d3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 1 Feb 2020 22:22:07 -0600
Subject: [PATCH] Add moon phase API
@@ -11,7 +11,7 @@ Subject: [PATCH] Add moon phase API
diff --git a/src/main/java/net/pl3x/purpur/MoonPhase.java b/src/main/java/net/pl3x/purpur/MoonPhase.java
new file mode 100644
index 00000000..f5ad98c6
index 000000000..f5ad98c62
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/MoonPhase.java
@@ -0,0 +1,36 @@
@@ -52,10 +52,10 @@ index 00000000..f5ad98c6
+ }
+}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 421ad6a9..a9a274a9 100644
index 906ee6827..e5232946e 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3244,6 +3244,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3273,6 +3273,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public List<Raid> getRaids();

6
patches/api/0024-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From bf422cd39e795cf7b12b77774a4c5ff1208ec819 Mon Sep 17 00:00:00 2001
From 386834e8745191fe5fc0436a6c50a5abeaf588b6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:34:36 -0500
Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
1 file changed, 10 insertions(+)
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index a9a274a9..d67d4355 100644
index e5232946e..822e06647 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3252,6 +3252,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3281,6 +3281,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
@NotNull
net.pl3x.purpur.MoonPhase getMoonPhase();

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

@@ -1,4 +1,4 @@
From 3137c64676b0170b7984033742e003bee6247542 Mon Sep 17 00:00:00 2001
From 2390a607636570bc73eb6a21ddf64e56e7b9bf37 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
@@ -241,10 +241,10 @@ index 000000000..d8b408f06
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b89f99a66..a1d3bc7ea 100644
index c2b7cb360..07c96d8a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -204,7 +204,7 @@ import javax.annotation.Nullable; // Paper
@@ -205,7 +205,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {

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

@@ -1,4 +1,4 @@
From f87963dc68e9fce84dff4bd5141425122ce305e2 Mon Sep 17 00:00:00 2001
From 9d60a1b0e3525b1703db089be68dd6b3a31d48f3 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
@@ -42,7 +42,7 @@ index e257d6b36..a6cd76fa5 100644
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index e62ca0543..018def64a 100644
index b07c49f1b..cf5abd393 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -192,6 +192,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -364,10 +364,10 @@ index 000000000..7d983d9a5
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a1d3bc7ea..a3024da0f 100644
index 07c96d8a9..7f707e689 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -814,6 +814,7 @@ public final class CraftServer implements Server {
@@ -815,6 +815,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -375,7 +375,7 @@ index a1d3bc7ea..a3024da0f 100644
for (WorldServer world : console.getWorlds()) {
world.worldData.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -842,6 +843,7 @@ public final class CraftServer implements Server {
@@ -843,6 +844,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
@@ -383,7 +383,7 @@ index a1d3bc7ea..a3024da0f 100644
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -860,6 +862,7 @@ public final class CraftServer implements Server {
@@ -861,6 +863,7 @@ public final class CraftServer implements Server {
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -391,7 +391,7 @@ index a1d3bc7ea..a3024da0f 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2100,6 +2103,18 @@ public final class CraftServer implements Server {
@@ -2105,6 +2108,18 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}

6
patches/server/0047-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From 5f65fb06c56c7d4381ae245c2e46b4ddf1053dfa Mon Sep 17 00:00:00 2001
From d119d9a7174b439e160e45cbca936cb48960ce8a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:16 -0500
Subject: [PATCH] Implement lagging threshold
@@ -46,10 +46,10 @@ index d3e1c8c40..ab20fa2fa 100644
private static void dontSendUselessEntityPackets() {
dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a3024da0f..0b474f64e 100644
index 7f707e689..c075e9d35 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2252,4 +2252,11 @@ public final class CraftServer implements Server {
@@ -2257,4 +2257,11 @@ public final class CraftServer implements Server {
return mobGoals;
}
// Paper end

6
patches/server/0053-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From 008c94f5ef0faf47199d34ebe95cfca35dba957e Mon Sep 17 00:00:00 2001
From e40b33149f2d4836c29f4ea74fb64d31ee21a0ba Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:19:14 -0500
Subject: [PATCH] Bring back server name
@@ -21,10 +21,10 @@ index 0c3ec8357..309f5562b 100644
public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
public final boolean pvp = this.getBoolean("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0b474f64e..047d48873 100644
index c075e9d35..b62cfb9a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2254,6 +2254,11 @@ public final class CraftServer implements Server {
@@ -2259,6 +2259,11 @@ public final class CraftServer implements Server {
// Paper end
// Purpur start

6
patches/server/0066-Add-5-second-tps-average-in-tps.patch
View File

@@ -1,4 +1,4 @@
From 311e767e57053c7e13ec74b143d4fc4e115a9572 Mon Sep 17 00:00:00 2001
From 2900aaeff3997f68cf9c35a4ad845b87aea0f586 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 28 Jul 2019 01:27:37 -0500
Subject: [PATCH] Add 5 second tps average in /tps
@@ -52,10 +52,10 @@ index d8822c29f..e06c0bb39 100644
lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 047d48873..869286b09 100644
index b62cfb9a9..e7605ee9f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2058,6 +2058,7 @@ public final class CraftServer implements Server {
@@ -2063,6 +2063,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {