From 043ecb54465293506d07972c7575df09c2a01c2c Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 16 May 2023 18:00:35 +0200 Subject: [PATCH] [Change] Removed Enderman Rate-limit --- .../betterend/mixin/common/MonsterMixin.java | 39 ------------------- .../resources/betterend.mixins.common.json | 1 - 2 files changed, 40 deletions(-) delete mode 100644 src/main/java/org/betterx/betterend/mixin/common/MonsterMixin.java diff --git a/src/main/java/org/betterx/betterend/mixin/common/MonsterMixin.java b/src/main/java/org/betterx/betterend/mixin/common/MonsterMixin.java deleted file mode 100644 index 15503c39..00000000 --- a/src/main/java/org/betterx/betterend/mixin/common/MonsterMixin.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.betterx.betterend.mixin.common; - -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobSpawnType; -import net.minecraft.world.entity.monster.EnderMan; -import net.minecraft.world.entity.monster.Monster; -import net.minecraft.world.level.ServerLevelAccessor; -import net.minecraft.world.phys.AABB; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import java.util.List; - -@Mixin(Monster.class) -public class MonsterMixin { - @Inject(method = "checkMonsterSpawnRules", at = @At(value = "RETURN"), cancellable = true) - private static void be_checkMonsterSpawnRules( - EntityType type, - ServerLevelAccessor serverWorldAccess, - MobSpawnType spawnReason, - BlockPos pos, - RandomSource random, - CallbackInfoReturnable info - ) { - boolean canSpawn = info.getReturnValue(); - if (canSpawn && spawnReason == MobSpawnType.NATURAL && type == EntityType.ENDERMAN) { - AABB box = new AABB(pos).inflate(16); - List entities = serverWorldAccess.getEntitiesOfClass(EnderMan.class, box, (entity) -> { - return true; - }); - info.setReturnValue(entities.size() < 6); - } - } -} diff --git a/src/main/resources/betterend.mixins.common.json b/src/main/resources/betterend.mixins.common.json index b20f039d..813af763 100644 --- a/src/main/resources/betterend.mixins.common.json +++ b/src/main/resources/betterend.mixins.common.json @@ -17,7 +17,6 @@ "EntityMixin", "LevelMixin", "LivingEntityMixin", - "MonsterMixin", "NoiseBasedChunkGeneratorAccessor", "NoiseChunkAccessor", "NoiseChunkMixin",