Helvetica Volubi
68 lines
4.5 KiB
Diff
68 lines
4.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
|
Date: Wed, 21 Jan 2026 21:28:21 +0800
|
|
Subject: [PATCH] Carpet Features Compatible
|
|
|
|
|
|
diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
|
|
index 7ee9eb8439330724c537f9b1451be78dd3a107ad..7577533f82688304f06c445fd5a1c3fa3c4575fc 100644
|
|
--- a/io/papermc/paper/threadedregions/RegionizedServer.java
|
|
+++ b/io/papermc/paper/threadedregions/RegionizedServer.java
|
|
@@ -241,7 +241,7 @@ public final class RegionizedServer {
|
|
final long tickStartNanos = System.nanoTime(); // Lophine - Carpet features
|
|
++this.tickCount;
|
|
// Luminol start - Add a config to enable tick command
|
|
- if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) {
|
|
+ if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick) { // Lophine - redirect
|
|
MinecraftServer.getServer().tickRateManager().tick();
|
|
}
|
|
// Luminol end - Add a config to enable tick command
|
|
@@ -435,7 +435,7 @@ public final class RegionizedServer {
|
|
}
|
|
|
|
private void tickTime(final ServerLevel world, final long tickCount) {
|
|
- if ((!me.earthme.luminol.config.modules.experiment.CommandConfig.tick || world.tickRateManager().runsNormally()) && world.tickTime) { // Luminol - Add a config to enable tick command
|
|
+ if ((!fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick || world.tickRateManager().runsNormally()) && world.tickTime) { // Luminol - Add a config to enable tick command // Lophine - redirect
|
|
world.serverLevelData.setGameTime(world.serverLevelData.getGameTime() + tickCount);
|
|
}
|
|
}
|
|
diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java
|
|
index 57a35d7a801621fc461e896eb2bba533d9d5bc1b..ae424c8931a2f82c6c8d4ddd8422a2c142a77a95 100644
|
|
--- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
|
|
+++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
|
|
@@ -576,7 +576,7 @@ public final class TickRegionScheduler {
|
|
// next start isn't updated until the end of this tick
|
|
this.tickRegion(tickCount, tickStart, scheduledEnd);
|
|
// Luminol start - Add a config to enable tick command
|
|
- if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) {
|
|
+ if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick) { // Lophine - redirect
|
|
MinecraftServer.getServer().tickRateManager().endTickWork();
|
|
}
|
|
// Luminol end - Add a config to enable tick command
|
|
diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
|
|
index 03f3fe221b14f0317947d74e25049bcce2ebeb66..6882e85fb6413e5c346c189a82b69f3e408aafba 100644
|
|
--- a/net/minecraft/commands/Commands.java
|
|
+++ b/net/minecraft/commands/Commands.java
|
|
@@ -268,7 +268,7 @@ public class Commands {
|
|
TellRawCommand.register(this.dispatcher, context);
|
|
//TestCommand.register(this.dispatcher, context); // Folia - region threading
|
|
// Luminol start - Add a config to enable tick command
|
|
- if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) {
|
|
+ if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick) { // Lophine - redirect
|
|
TickCommand.register(this.dispatcher); // Folia - region threading - TODO later
|
|
}
|
|
// Luminol end - Add a config to enable tick command
|
|
diff --git a/net/minecraft/world/level/dimension/end/EnderDragonFight.java b/net/minecraft/world/level/dimension/end/EnderDragonFight.java
|
|
index 3388bf5d2cff00b397af1dd7b9ab93669985b35c..e70a6c295e8c26bdf56528826801f037ad0f93b0 100644
|
|
--- a/net/minecraft/world/level/dimension/end/EnderDragonFight.java
|
|
+++ b/net/minecraft/world/level/dimension/end/EnderDragonFight.java
|
|
@@ -323,7 +323,7 @@ public class EnderDragonFight extends SavedData {
|
|
private int cachePortalOriginIteratorY = -1;
|
|
|
|
public BlockPattern.@Nullable BlockPatternMatch findExitPortal() {
|
|
- if (me.earthme.luminol.config.modules.optimizations.OptimizedDragonRespawnConfig.optimizedRespawn) {
|
|
+ if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.optimizedDragonRespawn) { // Lophine - Carpet Features Compatible
|
|
int i, j;
|
|
for (i = cachePortalChunkIteratorX; i <= 8; ++i) {
|
|
for (j = cachePortalChunkIteratorZ; j <= 8; ++j) {
|