Improve Valkyrien Skies and Immersive Portals compatibility (#581)

Acuadragon100 · Jeryn99 · web-flow · commit a5caa6edd93f · 2026-01-21T20:24:01.000Z
Co-authored-by: Craig &lt;sandedshoes@gmail.com&gt;
diff --git a/changelog.md b/changelog.md
@@ -9,6 +9,11 @@
 - Amethyst Screwdriver tooltip now is colored gray.
 - Updated create-fabric integration to create 6.
 
+#### Configs
+- New config option to disable teleportation for the Immersive Portals portal, instead teleporting the player directly as if Immersive Portals integration was disabled.
+- New config option to toggle the above setting separately when the door is on a Valkyrien Skies ship.
+- New config option to disable the collision box of the door while open with Immersive Portals integration enabled on Valkyrien Skies ships.
+
 #### Bug Fix
 - Bug fix: TARDIS exterior disappears when moved by other mods.
 - Bug fix: Taking off or landing a TARDIS on a Valkyrien Skies ship breaks the ship.
@@ -19,12 +24,14 @@
 - Bug fix: TARDIS does not take Valkyrien Skies ships into account when computing travel distance.
 - Bug fix: TARDIS does not automatically try to land on ships.
 - Bug fix: Flickering when spectating TARDIS exterior on a Valkyrien Skies ship.
+- Bug fix: Immersive Portals portal is not rotated correctly when door is on a Valkyrien Skies ship.
 
 - Bug fix: Fixes Console Textures having left over prefabs
 - Bug fix: Fixes Forge not having the same access level as Fabric (https://github.com/WhoCraft/TardisRefined/issues/477)
 - Bug fix: Fixed Shulker shells not having correct texture paths
 - Bug fix: Fixed the TARDIS forgetting its current dimension on world reload
 - Bug fix: Fix materialize around upgrade not working.
 - Bug fix: Fixed TARDIS being broken when created in a non-overworld dimension.
+- Bug fix: Immersive Portals portal sometimes not spawning when opened from exterior.
 - Bug fix: Respawn Anchor and /spawnpoint command not working inside the TARDIS
 
diff --git a/common/src/main/java/whocraft/tardis_refined/TRConfig.java b/common/src/main/java/whocraft/tardis_refined/TRConfig.java
@@ -53,9 +53,14 @@ public Client(ForgeConfigSpec.Builder builder) {
     public static class Common {
         public final ForgeConfigSpec.BooleanValue COMPATIBILITY_IP;
 
+        public final ForgeConfigSpec.BooleanValue IP_VS_COLLISION;
+
         public Common(ForgeConfigSpec.Builder builder) {
             builder.push("compatibility");
             COMPATIBILITY_IP = builder.comment("Toggle Immersive Portals compatibility (TR 2.0+). 2.0 has limited support").translation(ModMessages.CONFIG_IP_COMPAT).define("immersive_portals_support", true);
+            builder.push("immersive_portals_valkyrien_skies");
+            IP_VS_COLLISION = builder.comment("If false, the TARDIS door's collision box will be disabled when opened on a Valkyrien Skies ship if teleportation_mode_vs is set to PORTAL.").translation(ModMessages.CONFIG_IP_VS_COLLISION).define("open_door_ship_collision", true);
+            builder.pop();
             builder.pop();
         }
 
@@ -66,12 +71,30 @@ public static class Server {
         public final ForgeConfigSpec.ConfigValue<List<? extends String>> ADVENTURE_MODE_DEFAULTS;
         public final ForgeConfigSpec.BooleanValue ADVENTURE_MODE;
 
+        public final ForgeConfigSpec.EnumValue<IPTeleportationMode> IP_TELEPORTATION;
+        public final ForgeConfigSpec.EnumValue<IPTeleportationMode> IP_TELEPORTATION_VS;
+
+        public enum IPTeleportationMode {
+            PORTAL,
+            ITP;
+
+            private static final String COMMENT = "PORTAL is the normal immersive portals with maximum smoothness. ITP instead teleports the player directly similar to when Immersive Portals integration is disabled, making the boti effect purely visual.";
+        }
+
         public Server(ForgeConfigSpec.Builder builder) {
             builder.push("travel");
             BANNED_DIMENSIONS = builder.translation("config.tardis_refined.banned_dimensions").comment("A list of Dimensions the TARDIS cannot land in.").defineList("banned_dimensions", Lists.newArrayList("example:dimension"), String.class::isInstance);
             ADVENTURE_MODE_DEFAULTS = builder.translation("config.tardis_refined.adventure_mode_defaults").comment("A list of Dimensions that are automatically sampled").defineList("adventure_mode_defaults", Lists.newArrayList("minecraft:overworld"), String.class::isInstance);
             ADVENTURE_MODE = builder.translation("config.tardis_refined.adventure_mode").comment("Toggles whether players must discover and sample dimensions before they can travel there").define("adventure_mode", false);
             builder.pop();
+            builder.push("compatibility");
+            builder.push("immersive_portals");
+            IP_TELEPORTATION = builder.comment("Choose what teleportation method to use when walking through the TARDIS door. " + IPTeleportationMode.COMMENT).translation(ModMessages.CONFIG_IP_TELEPORTATION).defineEnum("teleportation_mode", IPTeleportationMode.PORTAL);
+            builder.pop();
+            builder.push("immersive_portals_valkyrien_skies");
+            IP_TELEPORTATION_VS = builder.comment("Choose what teleportation method to use when walking through the TARDIS door on a Valkyrien Skies ship. " + IPTeleportationMode.COMMENT + " ITP is recommended to avoid getting stuck in walls/the void when the ship is moving.").translation(ModMessages.CONFIG_IP_TELEPORTATION_VS).defineEnum("teleportation_mode_vs", IPTeleportationMode.ITP);
+            builder.pop();
+            builder.pop();
         }
 
     }
diff --git a/common/src/main/java/whocraft/tardis_refined/common/block/door/GlobalDoorBlock.java b/common/src/main/java/whocraft/tardis_refined/common/block/door/GlobalDoorBlock.java
@@ -17,13 +17,18 @@
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import whocraft.tardis_refined.TRConfig;
 import whocraft.tardis_refined.common.blockentity.door.GlobalDoorBlockEntity;
 import whocraft.tardis_refined.common.blockentity.life.EyeBlockEntity;
 import whocraft.tardis_refined.common.capability.tardis.TardisLevelOperator;
 import whocraft.tardis_refined.common.tardis.manager.AestheticHandler;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.portals.ImmersivePortals;
+import whocraft.tardis_refined.compat.valkyrienskies.VSHelper;
 
 public class GlobalDoorBlock extends InternalDoorBlock {
 
@@ -101,6 +106,15 @@ public VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, Block
 
     @Override
     public VoxelShape getCollisionShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext) {
+        BlockEntity blockEntity = blockGetter.getBlockEntity(blockPos);
+        //noinspection ConstantValue IntelliJ got confused by this for some reason...
+        if (
+                !TRConfig.COMMON.IP_VS_COLLISION.get() && blockEntity != null && blockEntity.getLevel() != null &&
+                ModCompatChecker.immersivePortals() && ImmersivePortals.isTeleportingPortalPresent(blockEntity.getLevel().dimension()) &&
+                ModCompatChecker.valkyrienSkies() && VSHelper.isBlockInShipyard(blockEntity.getLevel(), blockPos)
+        ) {
+            return Shapes.empty();
+        }
         return this.getShape(blockState, blockGetter, blockPos, collisionContext);
     }
 
diff --git a/common/src/main/java/whocraft/tardis_refined/common/block/door/InternalDoorBlock.java b/common/src/main/java/whocraft/tardis_refined/common/block/door/InternalDoorBlock.java
@@ -120,7 +120,9 @@ public void entityInside(BlockState blockState, Level level, BlockPos blockPos,
 
                 TardisLevelOperator.get(serverLevel).ifPresent(tardisLevelOperator -> {
                     if (!tardisLevelOperator.getPilotingManager().isInFlight()) {
-                        AABB teleportAABB = this.getCollisionShape(blockState, level, blockPos, CollisionContext.of(entity)).bounds().move(blockPos);
+                        VoxelShape teleportShape = this.getCollisionShape(blockState, level, blockPos, CollisionContext.of(entity));
+                        if (teleportShape.isEmpty()) return;
+                        AABB teleportAABB = teleportShape.bounds().move(blockPos);
                         if (TRTeleporter.teleportIfCollided(serverLevel, blockPos, entity, teleportAABB)) {
                             door.onAttemptEnter(blockState, serverLevel, blockPos, entity);
                         }
diff --git a/common/src/main/java/whocraft/tardis_refined/common/block/shell/GlobalShellBlock.java b/common/src/main/java/whocraft/tardis_refined/common/block/shell/GlobalShellBlock.java
@@ -19,12 +19,17 @@
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import whocraft.tardis_refined.TRConfig;
 import whocraft.tardis_refined.common.blockentity.shell.GlobalShellBlockEntity;
 import whocraft.tardis_refined.common.blockentity.shell.ShellBaseBlockEntity;
 import whocraft.tardis_refined.common.tardis.themes.ShellTheme;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.portals.ImmersivePortals;
+import whocraft.tardis_refined.compat.valkyrienskies.VSHelper;
 
 public class GlobalShellBlock extends ShellBaseBlock {
 
@@ -52,6 +57,14 @@ public BlockState getStateForPlacement(@NotNull BlockPlaceContext blockPlaceCont
     @Override
     public VoxelShape getCollisionShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext) {
         if (blockGetter.getBlockEntity(blockPos) instanceof GlobalShellBlockEntity shellBlockEntity) {
+            //noinspection ConstantValue IntelliJ got confused by this for some reason...
+            if (
+                    !TRConfig.COMMON.IP_VS_COLLISION.get() &&
+                    ModCompatChecker.immersivePortals() && ImmersivePortals.isTeleportingPortalPresent(shellBlockEntity.getTardisId()) &&
+                    ModCompatChecker.valkyrienSkies() && VSHelper.isBlockInShipyard(shellBlockEntity.getLevel(), blockPos)
+            ) {
+                return Shapes.empty();
+            }
             if (shellBlockEntity.theme() == ShellTheme.BRIEFCASE.getId())
                 return BRIEFCASE_COLLISION_SHAPE;
         }
diff --git a/common/src/main/java/whocraft/tardis_refined/common/block/shell/ShellBaseBlock.java b/common/src/main/java/whocraft/tardis_refined/common/block/shell/ShellBaseBlock.java
@@ -121,7 +121,9 @@ public void entityInside(BlockState blockState, Level level, BlockPos blockPos,
         if (!level.isClientSide()) {
             ServerLevel serverLevel = (ServerLevel) level;
             if (serverLevel.getBlockEntity(blockPos) instanceof ExteriorShell shellEntity) {
-                AABB teleportAABB = this.getCollisionShape(blockState, level, blockPos, CollisionContext.of(entity)).bounds().move(blockPos);
+                VoxelShape teleportShape = this.getCollisionShape(blockState, level, blockPos, CollisionContext.of(entity));
+                if (teleportShape.isEmpty()) return;
+                AABB teleportAABB = teleportShape.bounds().move(blockPos);
                 if (TRTeleporter.teleportIfCollided(serverLevel, blockPos, entity, teleportAABB)) {
                     shellEntity.onAttemptEnter(blockState, serverLevel, blockPos, entity);
                 }
diff --git a/common/src/main/java/whocraft/tardis_refined/common/blockentity/door/GlobalDoorBlockEntity.java b/common/src/main/java/whocraft/tardis_refined/common/blockentity/door/GlobalDoorBlockEntity.java
@@ -17,6 +17,9 @@
 import org.jetbrains.annotations.Nullable;
 import whocraft.tardis_refined.common.capability.tardis.TardisLevelOperator;
 import whocraft.tardis_refined.common.tardis.themes.ShellTheme;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.portals.ImmersivePortals;
+import whocraft.tardis_refined.compat.valkyrienskies.VSHelper;
 import whocraft.tardis_refined.constants.NbtConstants;
 import whocraft.tardis_refined.patterns.ShellPattern;
 import whocraft.tardis_refined.patterns.ShellPatterns;
@@ -172,6 +175,14 @@ public void playDoorLockedSound(boolean lockDoor) {
 
     @Override
     public void tick(Level level, BlockPos blockPos, BlockState blockState, InternalDoorBlockEntity blockEntity) {
+        //noinspection ConstantValue IntelliJ got confused by this for some reason...
+        if (
+                !level.isClientSide() && level instanceof ServerLevel sl &&
+                ModCompatChecker.valkyrienSkies() && VSHelper.isBlockInShipyard(level, blockPos) &&
+                ModCompatChecker.immersivePortals() && ImmersivePortals.doPortalsExistForTardis(level.dimension())
+        ) {
+            TardisLevelOperator.get(sl).ifPresent(ImmersivePortals::updatePortalPositions);
+        }
   /*      if (level instanceof ServerLevel serverLevel) {
             TardisLevelOperator.get(serverLevel).ifPresent(tardisLevelOperator -> {
                 if (blockEntity.isOpen() && tardisLevelOperator.getPilotingManager().isInFlight()) {
diff --git a/common/src/main/java/whocraft/tardis_refined/common/blockentity/shell/GlobalShellBlockEntity.java b/common/src/main/java/whocraft/tardis_refined/common/blockentity/shell/GlobalShellBlockEntity.java
@@ -23,7 +23,11 @@
 import whocraft.tardis_refined.common.tardis.manager.TardisExteriorManager;
 import whocraft.tardis_refined.common.tardis.manager.TardisPilotingManager;
 import whocraft.tardis_refined.common.tardis.themes.ShellTheme;
+import whocraft.tardis_refined.common.util.DimensionUtil;
 import whocraft.tardis_refined.common.util.PlayerUtil;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.portals.ImmersivePortals;
+import whocraft.tardis_refined.compat.valkyrienskies.VSHelper;
 import whocraft.tardis_refined.constants.ModMessages;
 import whocraft.tardis_refined.constants.NbtConstants;
 import whocraft.tardis_refined.patterns.ShellPattern;
@@ -73,6 +77,19 @@ public GlobalShellBlockEntity setPattern(ShellPattern basePattern) {
         return this;
     }
 
+    @Override
+    public void tick(Level level, BlockPos blockPos, BlockState blockState, ShellBaseBlockEntity blockEntity) {
+        super.tick(level, blockPos, blockState, blockEntity);
+	    //noinspection ConstantValue IntelliJ got confused by this for some reason...
+	    if (
+                !level.isClientSide() &&
+                ModCompatChecker.valkyrienSkies() && VSHelper.isBlockInShipyard(level, blockPos) &&
+                ModCompatChecker.immersivePortals() && ImmersivePortals.doPortalsExistForTardis(ImmersivePortals.getUUIDForTARDIS(TARDIS_ID))
+        ) {
+            TardisLevelOperator.get(DimensionUtil.getLevel(blockEntity.TARDIS_ID)).ifPresent(ImmersivePortals::updatePortalPositions);
+        }
+    }
+
     @Override
     public void load(CompoundTag pTag) {
         super.load(pTag);
diff --git a/common/src/main/java/whocraft/tardis_refined/common/blockentity/shell/ShellBaseBlockEntity.java b/common/src/main/java/whocraft/tardis_refined/common/blockentity/shell/ShellBaseBlockEntity.java
@@ -38,7 +38,8 @@
 import whocraft.tardis_refined.constants.NbtConstants;
 import whocraft.tardis_refined.registry.TRUpgrades;
 
-import java.util.UUID;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public abstract class ShellBaseBlockEntity extends BlockEntity implements ExteriorShell, BlockEntityTicker<ShellBaseBlockEntity> {
 
@@ -143,7 +144,7 @@ public void onAttemptEnter(BlockState blockState, Level level, BlockPos external
                         ResourceLocation theme = aesthetics.getShellTheme();
 
                         if (ModCompatChecker.immersivePortals()) {
-                            if (ImmersivePortals.isShellThemeSupported(theme) && ImmersivePortals.doPortalsExistForTardis(UUID.fromString(TARDIS_ID.location().getPath()))) {
+                            if (ImmersivePortals.isShellThemeSupported(theme) && ImmersivePortals.isTeleportingPortalPresent(TARDIS_ID)) {
                                 return;
                             }
                         }
diff --git a/common/src/main/java/whocraft/tardis_refined/common/capability/tardis/TardisLevelOperator.java b/common/src/main/java/whocraft/tardis_refined/common/capability/tardis/TardisLevelOperator.java
@@ -48,7 +48,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Optional;
-import java.util.UUID;
 
 import static whocraft.tardis_refined.common.block.shell.ShellBaseBlock.REGEN;
 
@@ -304,7 +303,7 @@ public boolean exitTardis(Entity entity, ServerLevel doorLevel, BlockPos doorPos
         if (aestheticHandler.getShellTheme() != null) {
             ResourceLocation theme = aestheticHandler.getShellTheme();
             if (ModCompatChecker.immersivePortals() && !(this.internalDoor instanceof RootShellDoorBlockEntity)) {
-                if (!ignoreDoor && level.dimensionTypeId() == TRDimensionTypes.TARDIS && ImmersivePortals.isShellThemeSupported(theme) && ImmersivePortals.doPortalsExistForTardis(UUID.fromString(doorLevel.dimension().location().getPath()))) {
+                if (!ignoreDoor && level.dimensionTypeId() == TRDimensionTypes.TARDIS && ImmersivePortals.isShellThemeSupported(theme) && ImmersivePortals.isTeleportingPortalPresent(doorLevel.dimension())) {
                     return false;
                 }
             }
diff --git a/common/src/main/java/whocraft/tardis_refined/common/util/TRTeleporter.java b/common/src/main/java/whocraft/tardis_refined/common/util/TRTeleporter.java
@@ -3,10 +3,7 @@
 import com.google.common.base.Preconditions;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
-import net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket;
-import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket;
-import net.minecraft.network.protocol.game.ClientboundSetExperiencePacket;
-import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
+import net.minecraft.network.protocol.game.*;
 import net.minecraft.server.TickTask;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -16,6 +13,7 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.PathfinderMob;
+import net.minecraft.world.entity.RelativeMovement;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
@@ -96,6 +94,14 @@ private static boolean performTeleport(Entity pEntity, ServerLevel destination,
             pEntity.setYRot(updatedYRot); //Set the desired yRot and xRot before teleportation. For non-players, this means the facing is copied over to the copy of the entity which we recreate. For players, it should update the rotation with the correct facing at the destination
             pEntity.setXRot(updatedXRot);
             ImmersivePortals.teleportViaIp(pEntity, destination, pX, pY, pZ);
+            // The rotation won't be set properly unless we set it afterward.
+            if (pEntity instanceof ServerPlayer player) {
+                player.connection.teleport(
+                        player.getX(), player.getY(), player.getZ(),
+                        updatedYRot, updatedXRot,
+                        Set.of(RelativeMovement.X, RelativeMovement.Y, RelativeMovement.Z)
+                );
+            }
             return true;
         }
 
diff --git a/common/src/main/java/whocraft/tardis_refined/compat/portals/BotiPortalEntity.java b/common/src/main/java/whocraft/tardis_refined/compat/portals/BotiPortalEntity.java
@@ -8,6 +8,7 @@
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.Level;
 import qouteall.imm_ptl.core.portal.Portal;
+import qouteall.imm_ptl.core.portal.animation.TimingFunction;
 import whocraft.tardis_refined.common.tardis.themes.ShellTheme;
 import whocraft.tardis_refined.constants.NbtConstants;
 
@@ -25,6 +26,8 @@ public class BotiPortalEntity extends Portal {
 
     public BotiPortalEntity(EntityType<?> entityType, Level world) {
         super(entityType, world);
+        this.animation.defaultAnimation.durationTicks = 1;
+        this.animation.defaultAnimation.timingFunction = TimingFunction.linear;
     }
 
     public ShellTheme getShellTheme() {
diff --git a/common/src/main/java/whocraft/tardis_refined/compat/portals/ImmersivePortals.java b/common/src/main/java/whocraft/tardis_refined/compat/portals/ImmersivePortals.java
diff --git a/common/src/main/java/whocraft/tardis_refined/compat/valkyrienskies/VSHelper.java b/common/src/main/java/whocraft/tardis_refined/compat/valkyrienskies/VSHelper.java
diff --git a/common/src/main/java/whocraft/tardis_refined/constants/ModMessages.java b/common/src/main/java/whocraft/tardis_refined/constants/ModMessages.java
diff --git a/fabric/build.gradle b/fabric/build.gradle
diff --git a/forge/src/main/java/whocraft/tardis_refined/common/data/LangProviderEnglish.java b/forge/src/main/java/whocraft/tardis_refined/common/data/LangProviderEnglish.java

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@`
`38`	`38`	`import whocraft.tardis_refined.constants.NbtConstants;`
`39`	`39`	`import whocraft.tardis_refined.registry.TRUpgrades;`
`40`	`40`
`41`		`-import java.util.UUID;`
	`41`	`+import java.util.Optional;`
	`42`	`+import java.util.concurrent.atomic.AtomicBoolean;`
`42`	`43`
`43`	`44`	`public abstract class ShellBaseBlockEntity extends BlockEntity implements ExteriorShell, BlockEntityTicker<ShellBaseBlockEntity> {`
`44`	`45`
`@@ -143,7 +144,7 @@ public void onAttemptEnter(BlockState blockState, Level level, BlockPos external`
`143`	`144`	`ResourceLocation theme = aesthetics.getShellTheme();`
`144`	`145`
`145`	`146`	`if (ModCompatChecker.immersivePortals()) {`
`146`		`- if (ImmersivePortals.isShellThemeSupported(theme) && ImmersivePortals.doPortalsExistForTardis(UUID.fromString(TARDIS_ID.location().getPath()))) {`
	`147`	`+ if (ImmersivePortals.isShellThemeSupported(theme) && ImmersivePortals.isTeleportingPortalPresent(TARDIS_ID)) {`
`147`	`148`	`return;`
`148`	`149`	`}`
`149`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@`
`48`	`48`	`import java.util.HashSet;`
`49`	`49`	`import java.util.Iterator;`
`50`	`50`	`import java.util.Optional;`
`51`		`-import java.util.UUID;`
`52`	`51`
`53`	`52`	`import static whocraft.tardis_refined.common.block.shell.ShellBaseBlock.REGEN;`
`54`	`53`
`@@ -304,7 +303,7 @@ public boolean exitTardis(Entity entity, ServerLevel doorLevel, BlockPos doorPos`
`304`	`303`	`if (aestheticHandler.getShellTheme() != null) {`
`305`	`304`	`ResourceLocation theme = aestheticHandler.getShellTheme();`
`306`	`305`	`if (ModCompatChecker.immersivePortals() && !(this.internalDoor instanceof RootShellDoorBlockEntity)) {`
`307`		`- if (!ignoreDoor && level.dimensionTypeId() == TRDimensionTypes.TARDIS && ImmersivePortals.isShellThemeSupported(theme) && ImmersivePortals.doPortalsExistForTardis(UUID.fromString(doorLevel.dimension().location().getPath()))) {`
	`306`	`+ if (!ignoreDoor && level.dimensionTypeId() == TRDimensionTypes.TARDIS && ImmersivePortals.isShellThemeSupported(theme) && ImmersivePortals.isTeleportingPortalPresent(doorLevel.dimension())) {`
`308`	`307`	`return false;`
`309`	`308`	`}`
`310`	`309`	`}`