NanaChiyo0721/Shiroha
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Updated Upstream(Folia)

Browse Source
This commit is contained in:
NanaChiyo0721
2026-07-18 19:48:30 +08:00
parent 9af4757cdb
commit 221b1474c5
29 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shiroha-server/minecraft-patches/features/0043-Add-status-bar.patch
+9 -9
View File
@@ -17,10 +17,10 @@ index 52dcbcf64c3a510d4a4524b7d0ee226d9a73511d..051d601e7e809518e8d82ae4ae325905
}
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index a3ff96cc86bd68dddabd4c49d990e1dce304268f..3466634dd5305657534b3e80ca25b016a4b40dee 100644
index 5be3e493f1638cc0befe5530c58ea15467a3a7ac..15e7d8f1fbc950f79486704f2133a7b10e303a8a 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -1731,7 +1731,46 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1741,7 +1741,46 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Folia end - region threading
//this.tickCount++; // Folia - region threading
//this.tickRateManager.tick(); // Folia - region threading
@@ -68,10 +68,10 @@ index a3ff96cc86bd68dddabd4c49d990e1dce304268f..3466634dd5305657534b3e80ca25b016
this.lastServerStatus = nano;
this.status = this.buildServerStatus();
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
index 5cbe42636a3fd19d4e9b56fb3200e7d17b81bdad..b29c64a57dada886e43a6da7c68ab8655dbf4224 100644
index ecb1b98723e78e9d2f3ce182be8f78f8f32a52da..ce0dca54b551c67797e197f848334f34e1fb3da7 100644
--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
@@ -1484,6 +1484,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
@@ -1485,6 +1485,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
public void tickNonPassenger(final Entity entity) {
// Paper start - log detailed entity tick information
ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot tick an entity off-main");
@@ -80,7 +80,7 @@ index 5cbe42636a3fd19d4e9b56fb3200e7d17b81bdad..b29c64a57dada886e43a6da7c68ab865
try {
// Folia - region threading
// Paper end - log detailed entity tick information
@@ -1560,6 +1562,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
@@ -1561,6 +1563,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
} finally {
// Folia - region threading
}
@@ -88,7 +88,7 @@ index 5cbe42636a3fd19d4e9b56fb3200e7d17b81bdad..b29c64a57dada886e43a6da7c68ab865
// Paper end - log detailed entity tick information
}
@@ -1571,6 +1574,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
@@ -1572,6 +1575,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
final int timerId = isActive ? entity.getType().tickTimerId : entity.getType().inactiveTickTimerId;
final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle foliaProfiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler();
foliaProfiler.startTimer(timerId);
@@ -97,7 +97,7 @@ index 5cbe42636a3fd19d4e9b56fb3200e7d17b81bdad..b29c64a57dada886e43a6da7c68ab865
try {
// Folia end - profiler
entity.setOldPosAndRot();
@@ -1612,6 +1617,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
@@ -1613,6 +1618,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
this.tickPassenger(entity, passenger, isActive); // Paper - EAR 2
}
} finally { foliaProfiler.stopTimer(timerId); } // Folia - profiler
@@ -171,10 +171,10 @@ index f03fa06c0ba56f7f5e1e45bc1568a490751efde3..eee1c14249addbf4714df733870da974
+ // KioCG end
}
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index f02768ae8fdc0e048720b839ae9f851e9395b6a8..15d3a39795b6505ba96c27f591d58001e2a73db1 100644
index 319997dca2b461b41b02ca2d9b0e3ed9fd05ac88..d03267acc5209512e15065fcfb2dd32e9eb2f878 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -6347,4 +6347,6 @@ public abstract class Entity
@@ -6421,4 +6421,6 @@ public abstract class Entity
return ((ServerLevel) this.level()).isPositionEntityTicking(this.blockPosition());
}
// Paper end