diff options
| author | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-10-21 01:17:43 -0400 |
|---|---|---|
| committer | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-10-21 01:17:43 -0400 |
| commit | cd6f6f42c7eb4d8088c9e0d1bdcf2bf486ba3e94 (patch) | |
| tree | 9809cfc0c7716f939b7e412877d4c863ae5c90b0 /src/main/java | |
| parent | 7ca2486ea8be757261e037848daf88ab3c660737 (diff) | |
| download | Skyblocker-cd6f6f42c7eb4d8088c9e0d1bdcf2bf486ba3e94.tar.gz Skyblocker-cd6f6f42c7eb4d8088c9e0d1bdcf2bf486ba3e94.tar.bz2 Skyblocker-cd6f6f42c7eb4d8088c9e0d1bdcf2bf486ba3e94.zip | |
Refactor Entity Mixin
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/mixins/EntityMixin.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixins/EntityMixin.java b/src/main/java/de/hysky/skyblocker/mixins/EntityMixin.java index 9f8701c1..38ff016b 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/EntityMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/EntityMixin.java @@ -10,8 +10,8 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; 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.CallbackInfoReturnable; + +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; @Mixin(Entity.class) public abstract class EntityMixin { @@ -22,8 +22,8 @@ public abstract class EntityMixin { @Shadow public abstract boolean isInvisible(); - @Inject(method = "isInvisibleTo", at = @At("HEAD"), cancellable = true) - public void skyblocker$showInvisibleArmorStands(PlayerEntity player, CallbackInfoReturnable<Boolean> cir) { - if (isInvisible() && Utils.isOnHypixel() && Debug.debugEnabled() && SkyblockerConfigManager.get().debug.showInvisibleArmorStands && type.equals(EntityType.ARMOR_STAND)) cir.setReturnValue(false); + @ModifyExpressionValue(method = "isInvisibleTo", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;isSpectator()Z")) + public boolean skyblocker$showInvisibleArmorStands(boolean isSpectator, PlayerEntity player) { + return isSpectator || (isInvisible() && Utils.isOnHypixel() && Debug.debugEnabled() && SkyblockerConfigManager.get().debug.showInvisibleArmorStands && type.equals(EntityType.ARMOR_STAND)); } } |