Fix #231

Author: JustRed23

patches/minecraft/net/minecraft/util/SpawnUtil.java.patch

@@ -1,12 +1,17 @@
 --- a/net/minecraft/util/SpawnUtil.java
 +++ b/net/minecraft/util/SpawnUtil.java
-@@ -17,6 +_,14 @@
+@@ -17,6 +_,19 @@
  import net.minecraft.world.level.block.state.BlockState;
 
  public class SpawnUtil {
 +
 +   //Ketting start - modified CraftBukkit code
 +   private static org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason trySpawnMob$reason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
++
++   public static void prepareTrySpawnMob(org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
++      trySpawnMob$reason = reason;
++   }
++
 +   public static <T extends Mob> Optional<T> trySpawnMob(EntityType<T> p_216404_, MobSpawnType p_216405_, ServerLevel p_216406_, BlockPos p_216407_, int p_216408_, int p_216409_, int p_216410_, SpawnUtil.Strategy p_216411_, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
 +      trySpawnMob$reason = reason;
 +      return trySpawnMob(p_216404_, p_216405_, p_216406_, p_216407_, p_216408_, p_216409_, p_216410_, p_216411_);

patches/minecraft/net/minecraft/world/entity/npc/Villager.java.patch

@@ -107,12 +107,13 @@
              p_35409_.addFreshEntityWithPassengers(witch);
              this.releaseAllPois();
              this.discard();
-@@ -816,7 +_,7 @@
+@@ -816,7 +_,8 @@
              return p_186293_.wantsToSpawnGolem(p_35399_);
           }).limit(5L).collect(Collectors.toList());
           if (list1.size() >= p_35400_) {
 -            if (SpawnUtil.trySpawnMob(EntityType.IRON_GOLEM, MobSpawnType.MOB_SUMMONED, p_35398_, this.blockPosition(), 10, 8, 6, SpawnUtil.Strategy.LEGACY_IRON_GOLEM).isPresent()) {
-+            if (!SpawnUtil.trySpawnMob(EntityType.IRON_GOLEM, MobSpawnType.MOB_SUMMONED, p_35398_, this.blockPosition(), 10, 8, 6, SpawnUtil.Strategy.LEGACY_IRON_GOLEM, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.VILLAGE_DEFENSE).isEmpty()) { // CraftBukkit
++            SpawnUtil.prepareTrySpawnMob(org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.VILLAGE_DEFENSE);
++            if (!SpawnUtil.trySpawnMob(EntityType.IRON_GOLEM, MobSpawnType.MOB_SUMMONED, p_35398_, this.blockPosition(), 10, 8, 6, SpawnUtil.Strategy.LEGACY_IRON_GOLEM).isEmpty()) { // CraftBukkit
                 list.forEach(GolemSensor::golemDetected);
              }
           }