Initial 26.2 port

2026-06-23 02:37:47 +02:00 · 2026-06-03 16:22:25 -07:00
parent bb69e15257
commit 1638c22046
144 changed files with 1133 additions and 830 deletions
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch
@@ -1,181 +0,0 @@
--- a/net/minecraft/server/level/ServerLevel.java
-+++ b/net/minecraft/server/level/ServerLevel.java
-@@ -219,6 +_,8 @@
-     private final StructureManager structureManager;
-     private final StructureCheck structureCheck;
-     private final boolean tickTime;
-+    private double preciseTime; // Purpur - Configurable daylight cycle
-+    private boolean forceTime; // Purpur - Configurable daylight cycle
-     private final LevelDebugSynchronizers debugSynchronizers = new LevelDebugSynchronizers(this);
- 
-     // CraftBukkit start
-@@ -643,8 +_,25 @@
-         // CraftBukkit end
-         this.tickTime = tickTime;
-         this.server = server;
-        this.customSpawners = customSpawners;
-+        this.customSpawners = new ArrayList<>(); // Purpur - Allow toggling special MobSpawners per world
-         this.serverLevelData = levelData;
-+        // Purpur start - Allow toggling special MobSpawners per world
-+        if (purpurConfig.phantomSpawning) {
-+            this.customSpawners.add(new net.minecraft.world.level.levelgen.PhantomSpawner());
-+        }
-+        if (purpurConfig.patrolSpawning) {
-+            this.customSpawners.add(new net.minecraft.world.level.levelgen.PatrolSpawner());
-+        }
-+        if (purpurConfig.catSpawning) {
-+            this.customSpawners.add(new net.minecraft.world.entity.npc.CatSpawner());
-+        }
-+        if (purpurConfig.villageSiegeSpawning) {
-+            this.customSpawners.add(new net.minecraft.world.entity.ai.village.VillageSiege());
-+        }
-+        if (purpurConfig.villagerTraderSpawning) {
-+            this.customSpawners.add(new net.minecraft.world.entity.npc.wanderingtrader.WanderingTraderSpawner(savedDataStorage));
-+        }
-+        // Purpur end - Allow toggling special MobSpawners per world
-         ChunkGenerator generator = levelStem.generator();
-         // CraftBukkit start
-         // Paper start - per-world time
-@@ -738,6 +_,7 @@
-         this.chunkDataController = new ca.spottedleaf.moonrise.patches.chunk_system.io.datacontroller.ChunkDataController((ServerLevel)(Object)this, this.chunkTaskScheduler);
-         // Paper end - rewrite chunk system
-         this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
-+        this.preciseTime = this.serverLevelData.getGameTime(); // Purpur - Configurable daylight cycle
-     }
- 
-     // Paper start
-@@ -794,7 +_,7 @@
-         }
- 
-         int percentage = this.getGameRules().get(GameRules.PLAYERS_SLEEPING_PERCENTAGE);
-        if (this.sleepStatus.areEnoughSleeping(percentage) && this.sleepStatus.areEnoughDeepSleeping(percentage, this.players)) {
-+        if (this.purpurConfig.playersSkipNight && this.sleepStatus.areEnoughSleeping(percentage) && this.sleepStatus.areEnoughDeepSleeping(percentage, this.players)) { // Purpur - Config for skipping night
-             Optional<Holder<WorldClock>> defaultClock = this.dimensionType().defaultClock();
-             org.bukkit.event.world.ClockTimeSkipEvent event = null; // Paper - per-world time
-             if (this.getGameRules().get(GameRules.ADVANCE_TIME) && defaultClock.isPresent()) {
-@@ -1036,9 +_,18 @@
-                     && this.random.nextDouble() < difficulty.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01) // Paper - Configurable spawn chances for skeleton horses
-                     && !this.getBlockState(pos.below()).is(BlockTags.LIGHTNING_RODS);
-                 if (isTrap) {
-+                    // Purpur start - Special mobs naturally spawn
-+                    net.minecraft.world.entity.animal.equine.AbstractHorse skeletonHorse;
-+                    if (purpurConfig.zombieHorseSpawnChance > 0D && random.nextDouble() <= purpurConfig.zombieHorseSpawnChance) {
-+                        skeletonHorse = EntityType.ZOMBIE_HORSE.create(this, EntitySpawnReason.EVENT);
-+                    } else {
-+                        skeletonHorse = EntityType.SKELETON_HORSE.create(this, EntitySpawnReason.EVENT);
-+                        if (skeletonHorse != null) ((SkeletonHorse) skeletonHorse).setTrap(true);
-+                    }
-+                    // Purpur end - Special mobs naturally spawn
-                     SkeletonHorse horse = EntityType.SKELETON_HORSE.create(this, EntitySpawnReason.EVENT);
-                     if (horse != null) {
-                        horse.setTrap(true);
-+                        //horse.setTrap(true); // Purpur - Special mobs naturally spawn - moved up
-                         horse.setAge(0);
-                         horse.setPos(pos.getX(), pos.getY(), pos.getZ());
-                         this.addFreshEntity(horse, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
-@@ -1073,9 +_,35 @@
-                 if (state.is(Blocks.SNOW)) {
-                     int currentLayers = state.getValue(SnowLayerBlock.LAYERS);
-                     if (currentLayers < Math.min(maxHeight, 8)) {
-+                        // Purpur start - Smooth snow accumulation
-+                        boolean canSnow = true;
-+                        // Ensure snow doesn't get more than N layers taller than its neighbors
-+                        // We only need to check blocks that are taller than the minimum step height
-+                        if (org.purpurmc.purpur.PurpurConfig.smoothSnowAccumulationStep > 0 && currentLayers >= org.purpurmc.purpur.PurpurConfig.smoothSnowAccumulationStep) {
-+                            int layersValueMin = currentLayers - org.purpurmc.purpur.PurpurConfig.smoothSnowAccumulationStep;
-+                            for (Direction direction : Direction.Plane.HORIZONTAL) {
-+                                BlockPos blockPosNeighbor = topPos.relative(direction);
-+                                BlockState blockStateNeighbor = this.getBlockState(blockPosNeighbor);
-+                                if (blockStateNeighbor.is(Blocks.SNOW)) {
-+                                    // Special check for snow layers, if neighbors are too short, don't accumulate
-+                                    int layersValueNeighbor = blockStateNeighbor.getValue(SnowLayerBlock.LAYERS);
-+                                    if (layersValueNeighbor <= layersValueMin) {
-+                                        canSnow = false;
-+                                        break;
-+                                    }
-+                                } else if (!Block.isFaceFull(blockStateNeighbor.getCollisionShape(this, blockPosNeighbor), direction.getOpposite())) {
-+                                    // Since our layer is tall enough already, if we have a non-full neighbor block, don't accumulate
-+                                    canSnow = false;
-+                                    break;
-+                                }
-+                            }
-+                        }
-+                        if (canSnow) {
-+                        // Purpur end - Smooth snow accumulation
-                         BlockState newState = state.setValue(SnowLayerBlock.LAYERS, currentLayers + 1);
-                         Block.pushEntitiesUp(state, newState, this, topPos);
-                         org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, topPos, newState, Block.UPDATE_ALL, null); // CraftBukkit
-+                        } // Purpur - Smooth snow accumulation
-                     }
-                 } else {
-                     org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, topPos, Blocks.SNOW.defaultBlockState(), Block.UPDATE_ALL, null); // CraftBukkit
-@@ -1096,7 +_,7 @@
-                 p -> p.is(PoiTypes.LIGHTNING_ROD),
-                 lightningRodPos -> lightningRodPos.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, lightningRodPos.getX(), lightningRodPos.getZ()) - 1,
-                 center,
-                128,
-+                org.purpurmc.purpur.PurpurConfig.lightningRodRange, // Purpur - Make lightning rod range configurable
-                 PoiManager.Occupancy.ANY
-             );
-         return nearbyLightningRod.map(blockPos -> blockPos.above(1));
-@@ -1144,8 +_,26 @@
-                 int percentage = this.getGameRules().get(GameRules.PLAYERS_SLEEPING_PERCENTAGE);
-                 Component message;
-                 if (this.sleepStatus.areEnoughSleeping(percentage)) {
-+                    // Purpur start - Customizable sleeping actionbar messages
-+                    if (org.purpurmc.purpur.PurpurConfig.sleepSkippingNight.isBlank()) {
-+                        return;
-+                    }
-+                    if (!org.purpurmc.purpur.PurpurConfig.sleepSkippingNight.equalsIgnoreCase("default")) {
-+                        message = io.papermc.paper.adventure.PaperAdventure.asVanilla(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(org.purpurmc.purpur.PurpurConfig.sleepSkippingNight));
-+                    } else
-+                    // Purpur end - Customizable sleeping actionbar messages
-                     message = Component.translatable("sleep.skipping_night");
-                 } else {
-+                    // Purpur start - Customizable sleeping actionbar messages
-+                    if (org.purpurmc.purpur.PurpurConfig.sleepingPlayersPercent.isBlank()) {
-+                        return;
-+                    }
-+                    if (!org.purpurmc.purpur.PurpurConfig.sleepingPlayersPercent.equalsIgnoreCase("default")) {
-+                        message = io.papermc.paper.adventure.PaperAdventure.asVanilla(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(org.purpurmc.purpur.PurpurConfig.sleepingPlayersPercent,
-+                            net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.parsed("count", Integer.toString(this.sleepStatus.amountSleeping())),
-+                            net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.parsed("total", Integer.toString(this.sleepStatus.sleepersNeeded(percentage)))));
-+                    } else
-+                    // Purpur end - Customizable sleeping actionbar messages
-                     message = Component.translatable("sleep.players_sleeping", this.sleepStatus.amountSleeping(), this.sleepStatus.sleepersNeeded(percentage));
-                 }
- 
-@@ -1311,6 +_,7 @@
-     public void resetWeatherCycle() {
-         WeatherData weatherData = this.getWeatherData();
-         // CraftBukkit start
-+        if (this.purpurConfig.rainStopsAfterSleep) // Purpur - Option for if rain and thunder should stop on sleep
-         weatherData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
-         // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
-         // Not that everyone ever manages to get the whole server to sleep at the same time....
-@@ -1318,6 +_,7 @@
-             weatherData.setRainTime(0);
-         }
-         // CraftBukkit end
-+        if (this.purpurConfig.thunderStopsAfterSleep) // Purpur - Option for if rain and thunder should stop on sleep
-         weatherData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
-         // CraftBukkit start
-         // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
-@@ -1989,7 +_,7 @@
-         Explosion.BlockInteraction blockInteraction = switch (interactionType) {
-             case NONE -> Explosion.BlockInteraction.KEEP;
-             case BLOCK -> this.getDestroyType(GameRules.BLOCK_EXPLOSION_DROP_DECAY);
-            case MOB -> this.getGameRules().get(GameRules.MOB_GRIEFING)
-+            case MOB -> ((source instanceof net.minecraft.world.entity.projectile.hurtingprojectile.LargeFireball) ? this.getGameRules().get(GameRules.MOB_GRIEFING, this.purpurConfig.fireballsMobGriefingOverride) : this.getGameRules().get(GameRules.MOB_GRIEFING)) // Purpur - Add mobGriefing override to everything affected
-                 ? this.getDestroyType(GameRules.MOB_EXPLOSION_DROP_DECAY)
-                 : Explosion.BlockInteraction.KEEP;
-             case TNT -> this.getDestroyType(GameRules.TNT_EXPLOSION_DROP_DECAY);
-@@ -2914,7 +_,7 @@
-             // 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 - Fix merchant inventory not closing on entity removal
-                if (entity.getBukkitEntity() instanceof org.bukkit.inventory.Merchant merchant && merchant.getTrader() != null) {
-+                if (!entity.level().purpurConfig.playerVoidTrading && entity.getBukkitEntity() instanceof org.bukkit.inventory.Merchant merchant && merchant.getTrader() != null) { // Purpur - Allow void trading
-                     merchant.getTrader().closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED);
-                 }
-                 // Paper end - Fix merchant inventory not closing on entity removal
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -435,6 +_,9 @@
+@@ -436,6 +_,9 @@
     public boolean isRealPlayer; // Paper
     public com.destroystokyo.paper.event.entity.@Nullable PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
     public org.bukkit.event.player.PlayerQuitEvent.@Nullable QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
@@ -8,9 +8,9 @@
 +    private boolean compassBar = false; // Purpur - Add compass command
 +    private boolean ramBar = false; // Purpur - Implement rambar commands
 
-     // Paper start - rewrite chunk system
-     private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-@@ -508,6 +_,9 @@
+     public ServerPlayer(final MinecraftServer server, final ServerLevel level, final GameProfile gameProfile, final ClientInformation clientInformation) {
+         super(level, gameProfile);
+@@ -480,6 +_,9 @@
         this.respawnConfig = input.read("respawn", ServerPlayer.RespawnConfig.CODEC).orElse(null);
         this.spawnExtraParticlesOnFall = input.getBooleanOr("spawn_extra_particles_on_fall", false);
         this.raidOmenPosition = input.read("raid_omen_position", BlockPos.CODEC).orElse(null);
@@ -20,7 +20,7 @@
         // Paper start - Expand PlayerGameModeChangeEvent
         this.loadGameTypes(input);
     }
-@@ -549,6 +_,9 @@
+@@ -522,6 +_,9 @@
             output.store("ShoulderEntityRight", CompoundTag.CODEC, this.getShoulderEntityRight());
         }
         this.getBukkitEntity().setExtraData(output); // CraftBukkit
@@ -30,7 +30,7 @@
     }
 
     private void saveParentVehicle(final ValueOutput playerOutput) {
-@@ -1179,6 +_,7 @@
+@@ -1158,6 +_,7 @@
             // Paper - moved up to sendClientboundPlayerCombatKillPacket()
             sendClientboundPlayerCombatKillPacket(event.getShowDeathMessages(), deathScreenMessage); // Paper - Expand PlayerDeathEvent
             Team team = this.getTeam();
@@ -38,7 +38,7 @@
             if (team == null || team.getDeathMessageVisibility() == Team.Visibility.ALWAYS) {
                 this.server.getPlayerList().broadcastSystemMessage(deathMessage, false);
             } else if (team.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
-@@ -1288,6 +_,13 @@
+@@ -1267,6 +_,13 @@
             return false;
         }
 
@@ -52,7 +52,7 @@
         Entity entity = source.getEntity();
         if (!( // Paper - split the if statement. If below statement is false, hurtServer would not have been evaluated. Return false.
             !(entity instanceof Player player && !this.canHarmPlayer(player))
-@@ -1529,7 +_,7 @@
+@@ -1508,7 +_,7 @@
         }
 
         if (newLevel.dimension() == lastDimension) {
@@ -61,7 +61,7 @@
             this.connection.resetPosition();
             transition.postTeleportTransition().onTransition(this);
             return this;
-@@ -1552,6 +_,7 @@
+@@ -1531,6 +_,7 @@
 
         profiler.pop();
         profiler.push("placing");
@@ -69,7 +69,7 @@
         this.setServerLevel(newLevel);
         this.connection.internalTeleport(PositionMoveRotation.of(transition), transition.relatives()); // CraftBukkit - use internal teleport without event
         this.connection.resetPosition();
-@@ -1664,7 +_,7 @@
+@@ -1643,7 +_,7 @@
                         new AABB(bedCenter.x() - 8.0, bedCenter.y() - 5.0, bedCenter.z() - 8.0, bedCenter.x() + 8.0, bedCenter.y() + 5.0, bedCenter.z() + 8.0),
                         monster -> monster.isPreventingPlayerRest(this.level(), this)
                     );
@@ -78,7 +78,7 @@
                     return Either.left(Player.BedSleepingProblem.NOT_SAFE);
                 }
             }
-@@ -1700,7 +_,17 @@
+@@ -1679,7 +_,17 @@
                 CriteriaTriggers.SLEPT_IN_BED.trigger(this);
             });
             if (!this.level().canSleepThroughNights()) {
@@ -97,7 +97,7 @@
             }
 
             this.level().updateSleepingPlayerList();
-@@ -1794,6 +_,7 @@
+@@ -1774,6 +_,7 @@
 
     @Override
     public void openTextEdit(final SignBlockEntity sign, final boolean isFrontText) {
@@ -105,7 +105,7 @@
         this.connection.send(new ClientboundBlockUpdatePacket(this.level(), sign.getBlockPos()));
         this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos(), isFrontText));
     }
-@@ -2138,6 +_,26 @@
+@@ -2118,6 +_,26 @@
         this.lastSentExp = -1; // CraftBukkit - Added to reset
     }
 
@@ -132,7 +132,7 @@
     @Override
     public void completeUsingItem() {
         if (!this.useItem.isEmpty() && this.isUsingItem()) {
-@@ -2373,6 +_,20 @@
+@@ -2355,6 +_,20 @@
         );
     }
 
@@ -153,7 +153,7 @@
     @Override
     public void sendSystemMessage(final Component message) {
         this.sendSystemMessage(message, false);
-@@ -2524,7 +_,67 @@
+@@ -2506,7 +_,67 @@
 
     public void resetLastActionTime() {
         this.lastActionTime = Util.getMillis();
@@ -222,7 +222,7 @@
 
     public ServerStatsCounter getStats() {
         return this.stats;
-@@ -3149,4 +_,65 @@
+@@ -3131,4 +_,65 @@
         return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
     }
     // CraftBukkit end
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/WorldGenRegion.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/WorldGenRegion.java.patch
@@ -1,8 +1,8 @@
 --- a/net/minecraft/server/level/WorldGenRegion.java
 +++ b/net/minecraft/server/level/WorldGenRegion.java
-@@ -292,6 +_,7 @@
-             return true;
-         } else {
+@@ -297,6 +_,7 @@
+             int chunkX = SectionPos.blockToSectionCoord(pos.getX());
+             int chunkZ = SectionPos.blockToSectionCoord(pos.getZ());
             // Paper start - Buffer OOB setBlock calls
 +            if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressSetBlockFarChunk) // Purpur - Logger settings (suppressing pointless logs)
             if (!hasSetFarWarned) {