This commit is contained in:
gnembon committed 2020-02-08 18:21:18 -04:00
1 parent e63dd15433
commit dffaec7355
2 files changed
+7 -10

No files matched your search

@@ -3,6 +3,7 @@ package carpet.mixins;
import carpet.CarpetSettings; import carpet.CarpetSettings;
import net.minecraft.entity.player.PlayerAbilities; import net.minecraft.entity.player.PlayerAbilities;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@@ -10,16 +11,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@Mixin(PlayerEntity.class) @Mixin(PlayerEntity.class)
public abstract class PlayerEntityMixin { public abstract class PlayerEntityMixin_portalDelayMixin
@Shadow {
public PlayerAbilities abilities; @Final @Shadow public PlayerAbilities abilities;
@Inject( @Inject(method = "getMaxNetherPortalTime()I", at = @At("HEAD"), cancellable = true)
method = "getMaxNetherPortalTime()I", private void onMaxNetherPortalTime(CallbackInfoReturnable<Integer> cir) {
at = @At("HEAD"),
cancellable = true
)
public void onMaxNetherPortalTime(CallbackInfoReturnable<Integer> cir) {
if(CarpetSettings.portalCreativeDelay != 1 && this.abilities.invulnerable) cir.setReturnValue(CarpetSettings.portalCreativeDelay); if(CarpetSettings.portalCreativeDelay != 1 && this.abilities.invulnerable) cir.setReturnValue(CarpetSettings.portalCreativeDelay);
else if(CarpetSettings.portalSurvivalDelay != 80 && !this.abilities.invulnerable) cir.setReturnValue(CarpetSettings.portalSurvivalDelay); else if(CarpetSettings.portalSurvivalDelay != 80 && !this.abilities.invulnerable) cir.setReturnValue(CarpetSettings.portalSurvivalDelay);
} }
+1 -1
View File
@@ -109,7 +109,7 @@
"EndCityFeatureMixin", "EndCityFeatureMixin",
"InfestedBlockMixin", "InfestedBlockMixin",
"PlayerEntityMixin", "PlayerEntityMixin_portalDelayMixin",
"PistonBlock_qcMixin", "PistonBlock_qcMixin",
"DispenserBlock_qcMixin", "DispenserBlock_qcMixin",