Fix teleportation bug, apply void air effects before tele out

Author: robotgryphon

src/main/java/dev/compactmods/machines/location/SimpleTeleporter.java

@@ -0,0 +1,22 @@
+package dev.compactmods.machines.location;
+
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.common.util.ITeleporter;
+
+import java.util.function.Function;
+
+public record SimpleTeleporter(Vec3 pos) implements ITeleporter {
+
+    public static SimpleTeleporter to(Vec3 pos) {
+        return new SimpleTeleporter(pos);
+    }
+
+    @Override
+    public Entity placeEntity(Entity entity, ServerLevel currentWorld, ServerLevel destWorld, float yaw, Function<Boolean, Entity> repositionEntity) {
+        entity = repositionEntity.apply(false);
+        entity.teleportTo(pos.x, pos.y, pos.z);
+        return entity;
+    }
+}

src/main/java/dev/compactmods/machines/util/PlayerUtil.java

@@ -4,15 +4,16 @@
 import dev.compactmods.machines.CompactMachines;
 import dev.compactmods.machines.advancement.AdvancementTriggers;
 import dev.compactmods.machines.api.core.Messages;
+import dev.compactmods.machines.api.room.IRoomHistory;
+import dev.compactmods.machines.api.room.history.IRoomHistoryItem;
 import dev.compactmods.machines.core.Capabilities;
 import dev.compactmods.machines.core.MissingDimensionException;
 import dev.compactmods.machines.core.Registration;
 import dev.compactmods.machines.i18n.TranslationUtil;
 import dev.compactmods.machines.location.PreciseDimensionalPosition;
+import dev.compactmods.machines.location.SimpleTeleporter;
 import dev.compactmods.machines.machine.CompactMachineBlockEntity;
 import dev.compactmods.machines.room.Rooms;
-import dev.compactmods.machines.api.room.IRoomHistory;
-import dev.compactmods.machines.api.room.history.IRoomHistoryItem;
 import dev.compactmods.machines.room.exceptions.NonexistentRoomException;
 import dev.compactmods.machines.room.history.PlayerRoomHistoryItem;
 import net.minecraft.core.BlockPos;
@@ -23,9 +24,9 @@
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.common.util.LazyOptional;
+
 import javax.annotation.Nonnull;
 import java.util.Optional;
 import java.util.UUID;
@@ -48,7 +49,7 @@ public static void teleportPlayerIntoMachine(Level machineLevel, Player player,
             throw new MissingDimensionException("Compact dimension not found; player attempted to enter machine.");
         }
 
-        if(machineLevel.getBlockEntity(machinePos) instanceof CompactMachineBlockEntity tile) {
+        if (machineLevel.getBlockEntity(machinePos) instanceof CompactMachineBlockEntity tile) {
             final var targetRoom = tile.getConnectedRoom();
             boolean grantAdvancement = targetRoom.isEmpty();
 
@@ -62,11 +63,12 @@ public static void teleportPlayerIntoMachine(Level machineLevel, Player player,
                 }
 
                 try {
+                    final var entry = PreciseDimensionalPosition.fromPlayer(player);
+
                     teleportPlayerIntoRoom(serv, player, room, grantAdvancement);
 
                     // Mark the player as inside the machine, set external spawn, and yeet
                     player.getCapability(Capabilities.ROOM_HISTORY).ifPresent(hist -> {
-                        var entry = PreciseDimensionalPosition.fromPlayer(player);
                         hist.addHistory(new PlayerRoomHistoryItem(entry, tile.getLevelPosition()));
                     });
                 } catch (MissingDimensionException | NonexistentRoomException e) {
@@ -91,13 +93,7 @@ public static void teleportPlayerIntoRoom(MinecraftServer serv, Player player, C
             Vec3 sr = spawn.getRotation().orElse(new Vec3(player.xRotO, player.yRotO, 0));
 
             if (player instanceof ServerPlayer servPlayer) {
-                servPlayer.teleportTo(
-                        compactDim,
-                        sp.x,
-                        sp.y,
-                        sp.z,
-                        (float) sr.y,
-                        (float) sr.x);
+                servPlayer.changeDimension(compactDim, SimpleTeleporter.to(sp));
 
                 if (grantAdvancement)
                     AdvancementTriggers.getTriggerForMachineClaim(roomSize).trigger(servPlayer);
@@ -117,8 +113,6 @@ public static void teleportPlayerOutOfMachine(ServerLevel world, @Nonnull Server
         }
 
         history.ifPresent(hist -> {
-            ChunkPos currentRoomChunk = new ChunkPos(serverPlayer.blockPosition());
-
             if (hist.hasHistory()) {
                 final IRoomHistoryItem prevArea = hist.pop();
 
@@ -130,18 +124,13 @@ public static void teleportPlayerOutOfMachine(ServerLevel world, @Nonnull Server
                 worldPos = spawnPoint.getExactPosition();
                 entryRot = spawnPoint.getRotation().orElse(Vec3.ZERO);
 
-                serverPlayer.teleportTo(level, worldPos.x(), worldPos.y(), worldPos.z(), (float) entryRot.y, (float) entryRot.x);
+                serverPlayer.changeDimension(level, SimpleTeleporter.to(worldPos));
             } else {
                 howDidYouGetThere(serverPlayer);
 
                 hist.clear();
                 teleportPlayerToRespawnOrOverworld(serv, serverPlayer);
             }
-
-            final LevelChunk chunk = serv.getLevel(Registration.COMPACT_DIMENSION)
-                    .getChunk(currentRoomChunk.x, currentRoomChunk.z);
-
-            // TODO - Send changed players packet to other clients
         });
     }
 
@@ -161,6 +150,6 @@ public static void teleportPlayerToRespawnOrOverworld(MinecraftServer serv, @Non
         if (player.getRespawnPosition() != null)
             worldPos = LocationUtil.blockPosToVector(player.getRespawnPosition());
 
-        player.teleportTo(level, worldPos.x(), worldPos.y(), worldPos.z(), 0, player.getRespawnAngle());
+        player.changeDimension(level, SimpleTeleporter.to(worldPos));
     }
 }

src/main/java/dev/compactmods/machines/wall/MachineVoidAir.java

@@ -1,11 +1,10 @@
 package dev.compactmods.machines.wall;
 
-import dev.compactmods.machines.CompactMachines;
+import dev.compactmods.machines.api.room.IRoomHistory;
 import dev.compactmods.machines.config.ServerConfig;
-import dev.compactmods.machines.core.Registration;
+import dev.compactmods.machines.core.Capabilities;
 import dev.compactmods.machines.util.PlayerUtil;
 import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.effect.MobEffectInstance;
@@ -36,13 +35,13 @@ public void entityInside(BlockState pState, Level pLevel, BlockPos pPos, Entity
         if (pEntity instanceof ServerPlayer player) {
             if (player.isCreative()) return;
 
-            if (player.getActiveEffectsMap().containsKey(MobEffects.BLINDNESS))
-                PlayerUtil.teleportPlayerOutOfMachine((ServerLevel) pLevel, player);
-
-
             player.addEffect(new MobEffectInstance(MobEffects.POISON, 5 * 20));
             player.addEffect(new MobEffectInstance(MobEffects.BLINDNESS, 5 * 20));
             player.hurt(DAMAGE_SOURCE, 1);
+
+            PlayerUtil.howDidYouGetThere(player);
+            player.getCapability(Capabilities.ROOM_HISTORY).ifPresent(IRoomHistory::clear);
+            PlayerUtil.teleportPlayerToRespawnOrOverworld(player.server, player);
         }
     }
 }