Merge branch 'fix-wired-teleporting' into 'dev'

Fixed wired teleporting breaks after teleporting from another room

See merge request morningstar/Arcturus-Community!103
This commit is contained in:
ArpyAge 2024-10-17 22:07:14 +00:00
commit 7160d3a94e

View File

@ -34,9 +34,14 @@ public class RoomUnitTeleport implements Runnable {
@Override
public void run() {
if (roomUnit == null || roomUnit.getRoom() == null || room.getLayout() == null || roomUnit.isLeavingTeleporter)
if (roomUnit == null || roomUnit.getRoom() == null || room.getLayout() == null)
return;
if (roomUnit.isLeavingTeleporter) {
roomUnit.isWiredTeleporting = false;
return;
}
RoomTile lastLocation = this.roomUnit.getCurrentLocation();
RoomTile newLocation = this.room.getLayout().getTile((short) this.x, (short) this.y);