From 44bf3cca437116b55ef0d57b776be87cdd09ca93 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Fri, 27 Oct 2023 00:57:58 +0300 Subject: [PATCH] remove freeze protection mixin in favor of minecraft tag --- .../mc/otm/mixin/MixinLivingEntity.java | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java index 0ea0fe3f3..3cb4441d6 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java +++ b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java @@ -1,6 +1,5 @@ package ru.dbotthepony.mc.otm.mixin; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraftforge.event.ForgeEventFactory; @@ -9,7 +8,6 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.config.ServerConfig; import ru.dbotthepony.mc.otm.core.util.ExperienceUtilsKt; @@ -18,24 +16,6 @@ import ru.dbotthepony.mc.otm.registry.MItems; @SuppressWarnings("ConstantConditions") @Mixin(LivingEntity.class) public class MixinLivingEntity { - @Inject( - method = "canFreeze()Z", - at = @At("HEAD"), - cancellable = true) - public void canFreeze(CallbackInfoReturnable hook) { - if (((Object) this) instanceof LivingEntity entity) { - boolean flag = - entity.getItemBySlot(EquipmentSlot.HEAD).is(MItems.INSTANCE.getTRITANIUM_HELMET()) && - entity.getItemBySlot(EquipmentSlot.CHEST).is(MItems.INSTANCE.getTRITANIUM_CHESTPLATE()) && - entity.getItemBySlot(EquipmentSlot.LEGS).is(MItems.INSTANCE.getTRITANIUM_PANTS()) && - entity.getItemBySlot(EquipmentSlot.FEET).is(MItems.INSTANCE.getTRITANIUM_BOOTS()) - ; - - if (flag) - hook.setReturnValue(false); - } - } - @Shadow protected Player lastHurtByPlayer;