mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
c51992977f
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@15309f9a Update to 1.21.11-rc2 PaperMC/Paper@f34efdb7 Pass SWEEP_ATTACK knockback reason PaperMC/Paper@eb37433d Re-add configurable combat exhaustion and event PaperMC/Paper@31af44d2 Re-add dropped hunk for visibility sounds PaperMC/Paper@252cfe14 Fix unnecessary player info remove packets being sent when hiding players (#12587) PaperMC/Paper@62dc8b32 Use book packet for both methods (#13298) PaperMC/Paper@7fdc16a8 Add configuration option to control fix for MC-159283 end rings (#13363) PaperMC/Paper@bb6c2d08 Use correct addresses for PlayerConnection (#13307) PaperMC/Paper@f08aad23 [ci/skip] Clarify Metadata API deprecation message (#13371) PaperMC/Paper@5f03e110 Fix isInteractable for copper chests (#13325) PaperMC/Paper@a339457c Readd dropped shulker box block hunk PaperMC/Paper@843cafd8 Update to 1.21.11-rc3 PaperMC/Paper@7db609b0 [ci/skip] diff housekeeping PaperMC/Paper@f6e937b9 Reimplement int based gamerule access (#13372)
47 lines
2.8 KiB
Diff
47 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: granny <contact@granny.dev>
|
|
Date: Mon, 8 Dec 2025 17:02:40 -0800
|
|
Subject: [PATCH] Setting to reintroduce end void rings
|
|
|
|
|
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
|
index cf817b5bab8e936bd40477d40359c35f2bf1d5fc..afb88446dc0aa2a3b0c4cbcdb44279c3c80ff076 100644
|
|
--- a/net/minecraft/server/MinecraftServer.java
|
|
+++ b/net/minecraft/server/MinecraftServer.java
|
|
@@ -1314,6 +1314,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
}
|
|
}
|
|
// Purpur end - config for startup commands
|
|
+ // Purpur start - Migrate Setting to reintroduce end void rings
|
|
+ if (org.purpurmc.purpur.configuration.transformation.FarEndTerrainGenerationMigration.HAS_BEEN_REGISTERED) {
|
|
+ try {
|
|
+ org.purpurmc.purpur.PurpurConfig.config.save((java.io.File) this.options.valueOf("purpur-settings"));
|
|
+ } catch (IOException ex) {
|
|
+ org.bukkit.Bukkit.getLogger().log(java.util.logging.Level.SEVERE, "Could not save " + this.options.valueOf("purpur-settings"), ex);
|
|
+ }
|
|
+ }
|
|
+ // Purpur end - Migrate Setting to reintroduce end void rings
|
|
|
|
while (this.running) {
|
|
final long tickStart = System.nanoTime(); // Paper - improve tick loop
|
|
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
|
|
index 6a0ccd6eb3e355348c68db3de980f4eddea1aaea..829ea2888927a3bd8b1b1e1961cdcff55c1cf3ce 100644
|
|
--- a/net/minecraft/server/dedicated/DedicatedServer.java
|
|
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
|
|
@@ -258,6 +258,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
|
org.spigotmc.SpigotConfig.registerCommands();
|
|
// Spigot end
|
|
io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // Paper - load mappings for stacktrace deobf and etc.
|
|
+ // Purpur start - Migrate Setting to reintroduce end void rings
|
|
+ try {
|
|
+ org.purpurmc.purpur.PurpurConfig.init((java.io.File) options.valueOf("purpur-settings"));
|
|
+ } catch (Exception e) {
|
|
+ DedicatedServer.LOGGER.error("Unable to load server configuration", e);
|
|
+ return false;
|
|
+ }
|
|
+ org.purpurmc.purpur.PurpurConfig.registerCommands();
|
|
+ // Purpur end - Migrate Setting to reintroduce end void rings
|
|
// Paper start - initialize global and world-defaults configuration
|
|
this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
|
|
this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
|