Added ageAsVariant for handsBusy check, when TF anims are disabled.

LtxProgrammer · Nov 28, 2024 · ae27d4a · ae27d4a
1 parent 99ae9fc
commit ae27d4a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/main/java/net/ltxprogrammer/changed/client/LocalTransfurVariantInstance.java b/src/main/java/net/ltxprogrammer/changed/client/LocalTransfurVariantInstance.java
@@ -19,7 +19,7 @@ public LocalTransfurVariantInstance(TransfurVariant<T> parent, LocalPlayer host)
     protected void tickTransfurProgress() {
         super.tickTransfurProgress();
 
-        if (transfurProgression < 1f) {
+        if (transfurProgression < 1f || this.ageAsVariant < 30) {
             ((LocalPlayerAccessor)host).setHandsBusy(true);
         } else if (host.getVehicle() == null && host.isHandsBusy()) {
             ((LocalPlayerAccessor)host).setHandsBusy(false);

diff --git a/src/main/java/net/ltxprogrammer/changed/mixin/entity/PlayerMixin.java b/src/main/java/net/ltxprogrammer/changed/mixin/entity/PlayerMixin.java
@@ -108,14 +108,6 @@ protected void getSwimSound(CallbackInfoReturnable<SoundEvent> ci) {
         }
     }
 
-    @Inject(method = "hurt", at = @At("HEAD"), cancellable = true)
-    public void orNotHurt(DamageSource p_36154_, float p_36155_, CallbackInfoReturnable<Boolean> cir) {
-        ProcessTransfur.ifPlayerTransfurred(EntityUtil.playerOrNull(this), variant -> {
-            if (variant.ageAsVariant < 30)
-                cir.cancel();
-        });
-    }
-
     @Inject(method = "createAttributes", at = @At("RETURN"))
     private static void addChangedAttributes(CallbackInfoReturnable<AttributeSupplier.Builder> cir) {
         cir.getReturnValue().add(ChangedAttributes.TRANSFUR_DAMAGE.get(), 3.0D);