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

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;
}