overwrite getMaxNetherPortalTime

src/main/java/carpet/mixins/PlayerEntityMixin.java

@@ -1,23 +1,17 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
-import carpet.helpers.PortalHelper;
+import net.minecraft.entity.player.PlayerAbilities;
 import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.Constant;
-import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(PlayerEntity.class)
-public abstract class PlayerEntityMixin
-{
-    @ModifyConstant(method = "getMaxNetherPortalTime",
-            constant = @Constant(intValue = 1))
-    private int addFillUpdatesInt(int original) {
-        if (CarpetSettings.portalCreativeDelay)
-            if (PortalHelper.player_holds_obsidian((PlayerEntity) (Object)this))
-                return 72000;
-            else
-                return 80;
-        return original;
+public abstract class PlayerEntityMixin {
+    @Shadow
+    public PlayerAbilities abilities;
+
+    public int getMaxNetherPortalTime() {
+        return this.abilities.invulnerable ? CarpetSettings.portalCreativeDelay : CarpetSettings.portalSurvivalDelay;
     }
 }