From 3e6bcd2bc6dc941ce47518835c73a4aabea2d4f7 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Tue, 10 Aug 2021 13:53:38 +0300 Subject: [PATCH] Effect fixes --- .../betterend/effects/EndStatusEffects.java | 27 +++---------------- .../ru/betterend/item/CrystaliteArmor.java | 4 ++- .../ru/betterend/item/CrystaliteBoots.java | 4 ++- .../mixin/common/LivingEntityMixin.java | 1 + 4 files changed, 10 insertions(+), 26 deletions(-) diff --git a/src/main/java/ru/betterend/effects/EndStatusEffects.java b/src/main/java/ru/betterend/effects/EndStatusEffects.java index a5bc7be8..f0948097 100644 --- a/src/main/java/ru/betterend/effects/EndStatusEffects.java +++ b/src/main/java/ru/betterend/effects/EndStatusEffects.java @@ -8,30 +8,9 @@ import ru.betterend.BetterEnd; import ru.betterend.effects.status.EndVeilEffect; public class EndStatusEffects { - public final static MobEffectInstance CRYSTALITE_HEALTH_REGEN = new MobEffectInstance( - MobEffects.REGENERATION, - 40, - 0, - true, - false, - true - ); - public final static MobEffectInstance CRYSTALITE_DIG_SPEED = new MobEffectInstance( - MobEffects.DIG_SPEED, - 40, - 0, - true, - false, - true - ); - public final static MobEffectInstance CRYSTALITE_MOVE_SPEED = new MobEffectInstance( - MobEffects.MOVEMENT_SPEED, - 40, - 0, - true, - false, - true - ); + public final static MobEffectInstance CRYSTALITE_HEALTH_REGEN = new MobEffectInstance(MobEffects.REGENERATION, 80, 0, true, false, true); + public final static MobEffectInstance CRYSTALITE_DIG_SPEED = new MobEffectInstance(MobEffects.DIG_SPEED, 80, 0, true, false, true); + public final static MobEffectInstance CRYSTALITE_MOVE_SPEED = new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 80, 0, true, false, true); public final static MobEffect END_VEIL = registerEffect("end_veil", new EndVeilEffect()); diff --git a/src/main/java/ru/betterend/item/CrystaliteArmor.java b/src/main/java/ru/betterend/item/CrystaliteArmor.java index 35690808..3aeeaf4c 100644 --- a/src/main/java/ru/betterend/item/CrystaliteArmor.java +++ b/src/main/java/ru/betterend/item/CrystaliteArmor.java @@ -30,7 +30,9 @@ public class CrystaliteArmor extends BaseArmorItem { } public static void applySetEffect(LivingEntity owner) { - owner.addEffect(new MobEffectInstance(EndStatusEffects.CRYSTALITE_HEALTH_REGEN)); + if ((owner.tickCount & 63) == 0) { + owner.addEffect(new MobEffectInstance(EndStatusEffects.CRYSTALITE_HEALTH_REGEN)); + } } static { diff --git a/src/main/java/ru/betterend/item/CrystaliteBoots.java b/src/main/java/ru/betterend/item/CrystaliteBoots.java index b72f98e0..66e63151 100644 --- a/src/main/java/ru/betterend/item/CrystaliteBoots.java +++ b/src/main/java/ru/betterend/item/CrystaliteBoots.java @@ -26,7 +26,9 @@ public class CrystaliteBoots extends CrystaliteArmor implements MobEffectApplier @Override public void applyEffect(LivingEntity owner) { - owner.addEffect(new MobEffectInstance(EndStatusEffects.CRYSTALITE_MOVE_SPEED)); + if ((owner.tickCount & 63) == 0) { + owner.addEffect(new MobEffectInstance(EndStatusEffects.CRYSTALITE_MOVE_SPEED)); + } } @Override diff --git a/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java b/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java index 147b6a18..9de64a4a 100644 --- a/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java +++ b/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java @@ -30,6 +30,7 @@ import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import ru.betterend.BetterEnd; +import ru.betterend.effects.EndStatusEffects; import ru.betterend.interfaces.FallFlyingItem; import ru.betterend.interfaces.MobEffectApplier; import ru.betterend.item.CrystaliteArmor;