mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2024-11-27 00:40:52 +01:00
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:
commit
7160d3a94e
@ -34,9 +34,14 @@ public class RoomUnitTeleport implements Runnable {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
if (roomUnit == null || roomUnit.getRoom() == null || room.getLayout() == null || roomUnit.isLeavingTeleporter)
|
if (roomUnit == null || roomUnit.getRoom() == null || room.getLayout() == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (roomUnit.isLeavingTeleporter) {
|
||||||
|
roomUnit.isWiredTeleporting = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
RoomTile lastLocation = this.roomUnit.getCurrentLocation();
|
RoomTile lastLocation = this.roomUnit.getCurrentLocation();
|
||||||
RoomTile newLocation = this.room.getLayout().getTile((short) this.x, (short) this.y);
|
RoomTile newLocation = this.room.getLayout().getTile((short) this.x, (short) this.y);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user