mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2024-07-07 07:25:34 +02:00
Merge branch '54-teleporters-glitch-if-you-pick-one-up-before-the-teleportation-has-completed' into 'dev'
Resolve "Teleporters Glitch if you pick one up before the teleportation has completed." See merge request morningstar/Arcturus-Community!16
This commit is contained in:
commit
1283c02937
|
@ -39,7 +39,10 @@ class TeleportActionThree implements Runnable
|
||||||
}
|
}
|
||||||
|
|
||||||
if(targetRoom == null)
|
if(targetRoom == null)
|
||||||
|
{
|
||||||
|
Emulator.getThreading().run(new TeleportActionFive(this.currentTeleport, this.room, this.client), 0);
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (targetRoom.isPreLoaded())
|
if (targetRoom.isPreLoaded())
|
||||||
{
|
{
|
||||||
|
@ -49,7 +52,10 @@ class TeleportActionThree implements Runnable
|
||||||
targetTeleport = targetRoom.getHabboItem(((InteractionTeleport) this.currentTeleport).getTargetId());
|
targetTeleport = targetRoom.getHabboItem(((InteractionTeleport) this.currentTeleport).getTargetId());
|
||||||
|
|
||||||
if(targetTeleport == null)
|
if(targetTeleport == null)
|
||||||
|
{
|
||||||
|
Emulator.getThreading().run(new TeleportActionFive(this.currentTeleport, this.room, this.client), 0);
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
RoomTile teleportLocation = targetRoom.getLayout().getTile(targetTeleport.getX(), targetTeleport.getY());
|
RoomTile teleportLocation = targetRoom.getLayout().getTile(targetTeleport.getX(), targetTeleport.getY());
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user