Repo-Mirror/KaiijuMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update upstream

Browse Source
This commit is contained in:
Kugge
2023-10-15 16:23:30 +02:00
parent daf406eff3
commit 68de640693
14 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -4,7 +4,7 @@ import io.papermc.paperweight.util.constants.*
plugins {
java
id("com.github.johnrengelman.shadow") version "8.1.1"
id("io.papermc.paperweight.patcher") version "1.5.6"
id("io.papermc.paperweight.patcher") version "1.5.7"
}
allprojects {

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = dev.kaiijumc.kaiiju
version = 1.20.2-R0.1-SNAPSHOT
mcVersion = 1.20.2
foliaRef = cdf356915b9051a6a895e53f663f24afb05c04a2
foliaRef = 84aecdc64afc48e73fffe01f6055c453567f2027
org.gradle.caching=true
org.gradle.parallel=true

8
patches/server/0001-Rebranding.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebranding
diff --git a/build.gradle.kts b/build.gradle.kts
index 521ff85fcf10fc85fe706d6fa3778e0569551829..2af41a9a1d64502046e1e714802a7b95abfd149b 100644
index 0dbcd376ab443af4853f0a02612866d71c5e9164..b374c8caf62db3e1325a3cb01bdd890a835541af 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
@@ -132,7 +132,7 @@ index 1d714d3eff11ed14f218656008190017494d4830..d39859f19afc4372999782a209f3836c
stringbuilder.append(CrashReport.DATE_TIME_FORMATTER.format(ZonedDateTime.now()));
stringbuilder.append("\n");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f9cf331202d0768a054e575c8909369920b3d59f..356f1fd44df5a9cf77655f788650415cadab53e1 100644
index 2f2a8a0c05024115f3b7bd69ae400fadff2f36c5..4d13cfdb642a67a5db20b1567868f24a37d949c3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -982,7 +982,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -144,7 +144,7 @@ index f9cf331202d0768a054e575c8909369920b3d59f..356f1fd44df5a9cf77655f788650415c
while (this.getRunningThread().isAlive()) {
this.getRunningThread().stop();
try {
@@ -1816,7 +1816,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1833,7 +1833,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -154,7 +154,7 @@ index f9cf331202d0768a054e575c8909369920b3d59f..356f1fd44df5a9cf77655f788650415c
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 249ff636a40f6493444a6ea8b8a5e017cb2c30eb..c750e9ea6576877473a3b82b7ab558e58017e172 100644
index a50a9ffda4875061fb8840873115119f334f0519..66723512de9b9fc92cdeeabb2cf96aa5fad10aaa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper

8
patches/server/0002-Empty-configuration.patch
View File

@@ -430,7 +430,7 @@ index a9fe3d1c0fc217bd32e884c9e75c906d8b4bf967..dcf8fd8ab06b10ecffae7332bc7e1a94
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// Paper end
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index f9641a54b2d1f2eed2a48323cfa6cdd67dafdf00..5e8de481f951c9424c25388ab5c4be6536d09326 100644
index 0ff6764c747ee6258ab9d722b48c24f0ddb2afdf..08f9e5d89a56c50d477437bd8ff15758fc7621cc 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -166,6 +166,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -442,7 +442,7 @@ index f9641a54b2d1f2eed2a48323cfa6cdd67dafdf00..5e8de481f951c9424c25388ab5c4be65
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPos lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
@@ -230,6 +232,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -233,6 +235,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
@@ -451,7 +451,7 @@ index f9641a54b2d1f2eed2a48323cfa6cdd67dafdf00..5e8de481f951c9424c25388ab5c4be65
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c750e9ea6576877473a3b82b7ab558e58017e172..d5599d0073f694ca33f75c21682477335c54f6bc 100644
index 66723512de9b9fc92cdeeabb2cf96aa5fad10aaa..86148da7878e8cf832eff299cbb3120a7a385a4f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1080,6 +1080,7 @@ public final class CraftServer implements Server {
@@ -493,7 +493,7 @@ index c750e9ea6576877473a3b82b7ab558e58017e172..d5599d0073f694ca33f75c2168247733
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index e7746952417a3ca4ea97103e38568db42039f717..ee9b4515cab3b9e1df73b01cb6246f283fba1eaf 100644
index e4cacb17f56c618bef19e1165c07aac86af61150..d29fe7ac0c68b2d57a0c6b6d06bbb4436bfc4c14 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -173,6 +173,14 @@ public class Main {

10
patches/server/0004-Add-Linear-region-format.patch
View File

@@ -9,7 +9,7 @@ This format saves about 50% of disk space.
Documentation: https://github.com/xymb-endcrystalme/LinearRegionFileFormatTools
diff --git a/build.gradle.kts b/build.gradle.kts
index 2af41a9a1d64502046e1e714802a7b95abfd149b..07efc7e9593f619c3b71bb3936077a66a0f2964d 100644
index b374c8caf62db3e1325a3cb01bdd890a835541af..7dd84de137e863cfc20582c1451a03ef6e4e495a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,6 +19,10 @@ dependencies {
@@ -598,7 +598,7 @@ index 513833c2ea23df5b079d157bc5cb89d5c9754c0b..abf5e2a06af9853b58ac9107cd6e9787
long expectedChunks = (long)regionFiles.length * (32L * 32L);
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index a1cbf387c72482034eeee6be8a5c2228131601a9..90991db650d2f0e9a3f7b00bb5b7586ade003bb0 100644
index 0f7e53dbac964391763bf6b380e65ce955a8a7a5..5868be332437cfa2cf21d48c02ba0bb73255b365 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -210,7 +210,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -619,7 +619,7 @@ index a1cbf387c72482034eeee6be8a5c2228131601a9..90991db650d2f0e9a3f7b00bb5b7586a
this.setServerViewDistance(viewDistance);
// Paper start
this.dataRegionManager = new io.papermc.paper.chunk.SingleThreadChunkRegionManager(this.level, 2, (1.0 / 3.0), 1, 6, "Data", DataRegionData::new, DataRegionSectionData::new);
@@ -813,13 +813,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -818,13 +818,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
// Paper start - chunk status cache "api"
public ChunkStatus getChunkStatusOnDiskIfCached(ChunkPos chunkPos) {
@@ -635,7 +635,7 @@ index a1cbf387c72482034eeee6be8a5c2228131601a9..90991db650d2f0e9a3f7b00bb5b7586a
if (regionFile == null || !regionFileCache.chunkExists(chunkPos)) {
return null;
@@ -837,7 +837,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -842,7 +842,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
}
public void updateChunkStatusOnDisk(ChunkPos chunkPos, @Nullable CompoundTag compound) throws IOException {
@@ -645,7 +645,7 @@ index a1cbf387c72482034eeee6be8a5c2228131601a9..90991db650d2f0e9a3f7b00bb5b7586a
regionFile.setStatus(chunkPos.x, chunkPos.z, ChunkSerializer.getStatus(compound));
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 8b41da9d1f43340b6ba3812a93f681419d0d7cd8..eb7a06f4d0e87d8cba86c7eccf2c1fa02ad503d2 100644
index 02937e40d429f42643f77b17c04277be535dc434..3e2c14b9acc9e5bec70055646387b51f0be43105 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -451,8 +451,8 @@ public class ServerLevel extends Level implements WorldGenLevel {

4
patches/server/0010-Server-mod-name.patch
View File

@@ -19,10 +19,10 @@ index 859c2ac4e46b840f9552d1ccbf9409c9666e84de..2aa40f154c48ee7558b0efdc3bf26e20
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 84242c7cdbeccda4c9a23e0376daf80ce221e504..033796ff383a70876ea89d29dd50e0ad926ae42f 100644
index ef9a17e9b9cd2866374aa22c5ec7c5b46b06e341..211868046f442f316f419734c03b2fa535bad196 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1816,7 +1816,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1833,7 +1833,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {

4
patches/server/0012-Toggle-void-trading.patch
View File

@@ -22,10 +22,10 @@ index f3f824d0ab1a2a72825c40b67192386479a0b34c..95ed6cb7b94797187d1011cab344e187
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 95e4ea89dbffb72322506e5e6c79e3605e2f9593..dd12059f7080f37d4d4f2ed72d9e3d35733956c3 100644
index 383e500ec098d671442f81bba6742ee44ca64450..3950b404482b0c6244141301e6ee3b4013327b2b 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2985,7 +2985,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -3016,7 +3016,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot Start
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
// Paper start

4
patches/server/0014-Toggle-tick-level-when-empty.patch
View File

@@ -22,10 +22,10 @@ index 6d7356cc07da58b1cef8d8963e790251d765de2c..601b9867d839f4928ba993ee8f00df9c
public boolean fixVoidTrading = true;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index dd12059f7080f37d4d4f2ed72d9e3d35733956c3..9e36630ec9b0c35101c97b67da5ecdc2af2bb0c3 100644
index 3950b404482b0c6244141301e6ee3b4013327b2b..ca065f1600713a7f509e54580c625287e94d1e40 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -931,7 +931,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -942,7 +942,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
timings.doSounds.stopTiming(); // Spigot
regionizedWorldData.setHandlingTick(false); // Folia - regionised ticking
gameprofilerfiller.pop();

18
patches/server/0020-Entity-ticking-throttling-removal-to-prevent-lag.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity ticking throttling & removal to prevent lag.
diff --git a/build.gradle.kts b/build.gradle.kts
index 8aa2f328f7fe3d85f7ddf05fa0259061eb950fff..30b2bf1776f3cc7526daad8b0d74be18084a3b0d 100644
index 5e79a464c912466952547cc294557821b6ff3576..6557a587f51f421b477557b17883578542fa1baf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
@@ -319,18 +319,18 @@ index 31397e53ab76266356c7582280d264c0f1df2504..4d077e459f385f86a0f35dd72d4fdc3a
dev.kaiijumc.kaiiju.KaiijuConfig.registerCommands();
// Kaiiju end
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 9e36630ec9b0c35101c97b67da5ecdc2af2bb0c3..d4d128e36924753ef480c8c5f1cfd459808c6b32 100644
index ca065f1600713a7f509e54580c625287e94d1e40..6a3964d3120dfd98c7a434dc86e221aeebcb0145 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -955,6 +955,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
} // Folia end - region threading
@@ -968,6 +968,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
} finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.DRAGON_FIGHT_TICK); } // Folia - profiler
}
+ if (kaiijuConfig.enableEntityThrottling) regionizedWorldData.entityThrottler.tickLimiterStart(); // Kaiiju
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
timings.entityTick.startTiming(); // Spigot
regionizedWorldData.forEachTickingEntity((entity) -> { // Folia - regionised ticking
@@ -977,6 +978,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.ENTITY_TICK); try { // Folia - profiler
@@ -991,6 +992,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
entity.stopRiding();
}
@@ -344,16 +344,16 @@ index 9e36630ec9b0c35101c97b67da5ecdc2af2bb0c3..d4d128e36924753ef480c8c5f1cfd459
gameprofilerfiller.push("tick");
this.guardEntityTick(this::tickNonPassenger, entity);
gameprofilerfiller.pop();
@@ -984,6 +992,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
@@ -999,6 +1007,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
});
} finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.ENTITY_TICK); } // Folia - profiler
+ if (kaiijuConfig.enableEntityThrottling) regionizedWorldData.entityThrottler.tickLimiterFinish(regionizedWorldData); // Kaiiju
timings.entityTick.stopTiming(); // Spigot
timings.tickEntities.stopTiming(); // Spigot
gameprofilerfiller.pop();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index ee9b4515cab3b9e1df73b01cb6246f283fba1eaf..f1fa2555b89946f7073fa2714bb252739f5f501f 100644
index d29fe7ac0c68b2d57a0c6b6d06bbb4436bfc4c14..b0e08392520fe21ef7b2dd66272da68411887223 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -179,6 +179,11 @@ public class Main {

8
patches/server/0025-Allow-user-to-enable-moving-into-unloaded-chunks.patch
View File

@@ -5,12 +5,12 @@ Subject: [PATCH] Allow user to enable moving into unloaded chunks
diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
index cb56735107028af16efe633f7179ba4c0481b0df..6ec138eb51d5386da4ad8ac5142aa68e291a7c96 100644
index 1e3ae1cb466b4757ce7fc0bd0201190230756bcc..8cf64c784d1768275b94fd1e4125c7c8742b3d5d 100644
--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
@@ -467,14 +467,14 @@ public class WorldConfiguration extends ConfigurationPart {
public class Chunks extends Post {
@Override
@@ -473,14 +473,14 @@ public class WorldConfiguration extends ConfigurationPart {
// Folia start - region threading - force prevent moving into unloaded chunks
@PostProcess
public void postProcess() {
- this.preventMovingIntoUnloadedChunks = true;
+ //this.preventMovingIntoUnloadedChunks = true; // Kaiiju - Don't

4
patches/server/0028-Option-to-disable-vanish-api.patch
View File

@@ -20,10 +20,10 @@ index 23b43de57a07b2b7b180f1aabd17e7e30830b521..59b41c29f42072ec2d3ba03b09e0ead8
public static String serverModName = "Kaiiju";
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index c0ee91a1f333434a2529429d670b62a83aeeb7b2..43d0afb4aa3c02bfbfdaa2723bd8f9fbd4846a1f 100644
index 04e249699e1c1a82d4c94b94b815ffa8fd97a99e..fbb0723ebd7dfef04252de694dc29b979c563452 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1362,7 +1362,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1376,7 +1376,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
// Folia end - region threading
// CraftBukkit start - respect vanish API

4
patches/server/0029-Option-to-disable-player-stats.patch
View File

@@ -21,10 +21,10 @@ index 59b41c29f42072ec2d3ba03b09e0ead897800ee1..b11a329ead2347917d24d932c9a1a826
public static String serverModName = "Kaiiju";
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 500b05ce2cda7b2c0e5332e2921d55a3101fc451..b61a9a14952ed5f063d6e343c1a07aa57ae90320 100644
index 42ff3d94ee451ced69c1059f0dbd45085489a60d..374dc5fd0ad15ace5314f2b9c675d1770a43f45a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2143,6 +2143,7 @@ public class ServerPlayer extends Player {
@@ -2144,6 +2144,7 @@ public class ServerPlayer extends Player {
@Override
public void awardStat(Stat<?> stat, int amount) {

30
patches/server/0030-Option-to-disable-achievements.patch
View File

@@ -24,10 +24,10 @@ index 9f0095f2196133a8bcffd5306aa9ac0b99b2f8d7..31d66bb2fcf4bb7262df2d8006e307fe
public boolean fixVoidTrading = true;
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0abc4dc35d 100644
index 374dc5fd0ad15ace5314f2b9c675d1770a43f45a..0a65f35f247a39e89d64721499162b419475da4f 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -799,7 +799,7 @@ public class ServerPlayer extends Player {
@@ -800,7 +800,7 @@ public class ServerPlayer extends Player {
@Override
protected void onInsideBlock(BlockState state) {
@@ -36,7 +36,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
}
@Override
@@ -846,9 +846,9 @@ public class ServerPlayer extends Player {
@@ -847,9 +847,9 @@ public class ServerPlayer extends Player {
}
}
@@ -48,7 +48,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
}
this.trackStartFallingPosition();
@@ -923,7 +923,7 @@ public class ServerPlayer extends Player {
@@ -924,7 +924,7 @@ public class ServerPlayer extends Player {
}
if (this.tickCount % 20 == 0) {
@@ -57,7 +57,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
}
// CraftBukkit start - initialize oldLevel, fire PlayerLevelChangeEvent, and tick client-sided world border
@@ -952,7 +952,7 @@ public class ServerPlayer extends Player {
@@ -953,7 +953,7 @@ public class ServerPlayer extends Player {
@Override
public void resetFallDistance() {
if (this.getHealth() > 0.0F && this.startingToFallPosition != null) {
@@ -66,7 +66,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
}
this.startingToFallPosition = null;
@@ -971,7 +971,7 @@ public class ServerPlayer extends Player {
@@ -972,7 +972,7 @@ public class ServerPlayer extends Player {
if (this.enteredLavaOnVehiclePosition == null) {
this.enteredLavaOnVehiclePosition = this.position();
} else {
@@ -75,7 +75,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
}
}
@@ -1175,7 +1175,7 @@ public class ServerPlayer extends Player {
@@ -1176,7 +1176,7 @@ public class ServerPlayer extends Player {
this.handleTeamKill(s, s1, ObjectiveCriteria.TEAM_KILL);
this.handleTeamKill(s1, s, ObjectiveCriteria.KILLED_BY_TEAM);
@@ -84,7 +84,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
}
}
@@ -1293,7 +1293,7 @@ public class ServerPlayer extends Player {
@@ -1294,7 +1294,7 @@ public class ServerPlayer extends Player {
this.wonGame = false;
this.respawn((player) -> {
@@ -93,7 +93,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
}, true);
}
@@ -1787,14 +1787,14 @@ public class ServerPlayer extends Player {
@@ -1788,14 +1788,14 @@ public class ServerPlayer extends Player {
maindimensionkey1 = resourcekey1;
}
// Paper end
@@ -111,7 +111,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
}
if (maindimensionkey1 != Level.NETHER) { // CraftBukkit
@@ -1872,7 +1872,7 @@ public class ServerPlayer extends Player {
@@ -1873,7 +1873,7 @@ public class ServerPlayer extends Player {
{
Either<Player.BedSleepingProblem, Unit> either = super.startSleepInBed(blockposition, force).ifRight((unit) -> {
this.awardStat(Stats.SLEEP_IN_BED);
@@ -120,7 +120,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
});
if (!this.serverLevel().canSleepThroughNights()) {
@@ -2163,7 +2163,7 @@ public class ServerPlayer extends Player {
@@ -2164,7 +2164,7 @@ public class ServerPlayer extends Player {
@Override
public void triggerRecipeCrafted(RecipeHolder<?> recipe, List<ItemStack> ingredients) {
@@ -129,7 +129,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
}
@Override
@@ -2292,14 +2292,14 @@ public class ServerPlayer extends Player {
@@ -2293,14 +2293,14 @@ public class ServerPlayer extends Player {
this.levitationStartPos = this.position();
}
@@ -146,7 +146,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
}
@Override
@@ -2310,7 +2310,7 @@ public class ServerPlayer extends Player {
@@ -2311,7 +2311,7 @@ public class ServerPlayer extends Player {
this.levitationStartPos = null;
}
@@ -155,7 +155,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
}
@Override
@@ -2855,7 +2855,7 @@ public class ServerPlayer extends Player {
@@ -2856,7 +2856,7 @@ public class ServerPlayer extends Player {
@Override
protected void updateUsingItem(ItemStack stack) {
@@ -164,7 +164,7 @@ index b61a9a14952ed5f063d6e343c1a07aa57ae90320..ee4603089d852496c51e4af13dcf4b0a
super.updateUsingItem(stack);
}
@@ -2884,7 +2884,7 @@ public class ServerPlayer extends Player {
@@ -2885,7 +2885,7 @@ public class ServerPlayer extends Player {
Entity entity = item.getOwner();
if (entity != null) {

6
patches/server/0032-Option-to-disable-creatures-spawn-events.patch
View File

@@ -25,10 +25,10 @@ index 31d66bb2fcf4bb7262df2d8006e307fee92660ea..c9830912019079369268bfbf2c95de18
public boolean fixVoidTrading = true;
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 18735dbd0d2bae1576d2bdb7402d98e9affbd599..2ae03f7dc08c00318cafa305a92ab21115d6bc02 100644
index 72a5973c6e150533ec70496d72b53c80a142eef7..891edd228699915f165ddf3ca4fcee502874780d 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -530,7 +530,11 @@ public class ServerChunkCache extends ChunkSource {
@@ -540,7 +540,11 @@ public class ServerChunkCache extends ChunkSource {
chunkRange = (chunkRange > viewDistance) ? viewDistance : chunkRange;
chunkRange = (chunkRange > DistanceManager.MOB_SPAWN_RANGE) ? DistanceManager.MOB_SPAWN_RANGE : chunkRange;
@@ -41,7 +41,7 @@ index 18735dbd0d2bae1576d2bdb7402d98e9affbd599..2ae03f7dc08c00318cafa305a92ab211
event.callEvent();
if (event.isCancelled() || event.getSpawnRadius() < 0) {
regionizedWorldData.mobSpawnMap.remove(player); // Folia - region threading
@@ -538,14 +542,18 @@ public class ServerChunkCache extends ChunkSource {
@@ -548,14 +552,18 @@ public class ServerChunkCache extends ChunkSource {
player.lastEntitySpawnRadiusSquared = -1.0;
continue;
}