nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2025-01-18 23:46:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '54-teleporters-glitch-if-you-pick-one-up-before-the-teleportation-has-completed' into 'dev'

Browse Source 
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:
Harmonic 2019-05-09 22:47:06 -04:00
commit 1283c02937
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionThree.java
View File

@ -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());