mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 09:27:43 +01:00
b7f623afe5
Upstream has released updates that appear to apply and compile correctly Paper Changes:9259558b58Fix remapping issue with RangedAttackMob and RangedEntity (#7167)3d9385e665Add material tags for copper blocks (#7141)75f4cb074aMove setShouldBurnInDay to AbstractSkeleton (#7120)9adc0b243bFix breakNaturally for fluid-logged blocks (#7134)76f327471dMove VehicleCollisionEvent HandlerList up (#7112)d4c819056dForward CraftEntity in teleport command (#7025)9012ae8880Improve scoreboard entries (#6871)264b11d9f3Entity powdered snow API (#6833)a6a6a3db24[ci skip] Revert change to apatch script2cf6a57bcaFix entity type tags suggestions in selectors (#6468)8a21c1742bAdd API for item entity health (#6514)26fbb02aaeAdventure changes for Java 17 and Component support for resourcepack prompt10bfb63f6cConfigurable max block light for monster spawning (#7129)6e5ceb34ebFix ChunkMap distanceManager field reobf82eaf4ee15Fix duplicated BlockPistonRetractEvent call (#7111)cf621c5eb3Load effect amplifiers greater than 127 correctly (#7175)1ce4281666Fix ABI breakage for plainSerializer (#7178)bf826b3fac[ci skip] Update Gradle wrapper to 7.3.3464b1715bbAdd uncaught exception handler using logger to usages of ThreadFactoryBuilder (#7179)
41 lines
2.5 KiB
Diff
41 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Encode42 <me@encode42.dev>
|
|
Date: Tue, 23 Mar 2021 15:40:45 -0400
|
|
Subject: [PATCH] Config to disable hostile mob spawn on ice
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java
|
|
index 1d66588cfe94d190a34dc376b4b5bff9461a3529..d2dbb7a6832ffc0c8759f26f685428ce86d6b7c8 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Monster.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Monster.java
|
|
@@ -88,6 +88,12 @@ public abstract class Monster extends PathfinderMob implements Enemy {
|
|
}
|
|
|
|
public static boolean isDarkEnoughToSpawn(ServerLevelAccessor world, BlockPos pos, Random random) {
|
|
+ // Purpur start
|
|
+ net.minecraft.world.level.block.state.BlockState spawnBlock = world.getBlockState(pos.below());
|
|
+ if ((!world.getMinecraftWorld().purpurConfig.mobsSpawnOnPackedIce && spawnBlock.is(net.minecraft.world.level.block.Blocks.PACKED_ICE)) || (!world.getMinecraftWorld().purpurConfig.mobsSpawnOnBlueIce && spawnBlock.is(net.minecraft.world.level.block.Blocks.BLUE_ICE))) {
|
|
+ return false;
|
|
+ }
|
|
+ // Purpur end
|
|
if (world.getBrightness(LightLayer.SKY, pos) > random.nextInt(32)) {
|
|
return false;
|
|
} else if (world.getBrightness(LightLayer.BLOCK, pos) > (world.getLevel().paperConfig.maxBlockLightForMonsterSpawning >= 0 ? world.getLevel().paperConfig.maxBlockLightForMonsterSpawning : 0)) { // Paper - configurable max block light level
|
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
index 07dce1b9affedb5ae6888431e713accfe8871c26..5eec80e7266ffe9c5f51eb500c40d680aac53ccc 100644
|
|
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
@@ -546,8 +546,12 @@ public class PurpurWorldConfig {
|
|
}
|
|
|
|
public boolean snowOnBlueIce = true;
|
|
+ public boolean mobsSpawnOnPackedIce = true;
|
|
+ public boolean mobsSpawnOnBlueIce = true;
|
|
private void iceSettings() {
|
|
snowOnBlueIce = getBoolean("blocks.blue_ice.allow-snow-formation", snowOnBlueIce);
|
|
+ mobsSpawnOnPackedIce = getBoolean("blocks.packed_ice.allow-mob-spawns", mobsSpawnOnPackedIce);
|
|
+ mobsSpawnOnBlueIce = getBoolean("blocks.blue_ice.allow-mob-spawns", mobsSpawnOnBlueIce);
|
|
}
|
|
|
|
public boolean lavaInfinite = false;
|