nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-07-04 14:25:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Wired teleport onWalk works correctly if item moved during wait

Browse Source
This commit is contained in:
Beny 2019-05-23 15:22:14 +01:00
parent b0601b93dd
commit 59613f8900
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java
View File

@ -121,47 +121,45 @@ public class WiredEffectTeleport extends InteractionWiredEffect
} }
public static void teleportUnitToTile(RoomUnit roomUnit, RoomTile tile) { public static void teleportUnitToTile(RoomUnit roomUnit, RoomTile tile) {
if(roomUnit == null || tile == null) if (roomUnit == null || tile == null)
return; return;
Room room = roomUnit.getRoom(); Room room = roomUnit.getRoom();
if(room == null) if (room == null)
return; return;
// makes a temporary effect // makes a temporary effect
room.sendComposer(new RoomUserEffectComposer(roomUnit, 4).compose()); room.sendComposer(new RoomUserEffectComposer(roomUnit, 4).compose());
Emulator.getThreading().run(new SendRoomUnitEffectComposer(room, roomUnit), WiredHandler.TELEPORT_DELAY); Emulator.getThreading().run(new SendRoomUnitEffectComposer(room, roomUnit), WiredHandler.TELEPORT_DELAY);
if (tile.state == RoomTileState.INVALID || tile.state == RoomTileState.BLOCKED) if (tile.state == RoomTileState.INVALID || tile.state == RoomTileState.BLOCKED) {
{
RoomTile alternativeTile = null; RoomTile alternativeTile = null;
List<RoomTile> optionalTiles = room.getLayout().getTilesAround(tile); List<RoomTile> optionalTiles = room.getLayout().getTilesAround(tile);
Collections.reverse(optionalTiles); Collections.reverse(optionalTiles);
for (RoomTile optionalTile : optionalTiles) for (RoomTile optionalTile : optionalTiles) {
{ if (optionalTile.state != RoomTileState.INVALID && optionalTile.state != RoomTileState.BLOCKED) {
if (optionalTile.state != RoomTileState.INVALID && optionalTile.state != RoomTileState.BLOCKED)
{
alternativeTile = optionalTile; alternativeTile = optionalTile;
} }
} }
if(alternativeTile != null) { if (alternativeTile != null) {
tile = alternativeTile; tile = alternativeTile;
} }
} }
Emulator.getThreading().run(new RoomUnitTeleport(roomUnit, room, tile.x, tile.y, tile.getStackHeight() + (tile.state == RoomTileState.SIT ? -0.5 : 0) , roomUnit.getEffectId()), WiredHandler.TELEPORT_DELAY); Emulator.getThreading().run(new RoomUnitTeleport(roomUnit, room, tile.x, tile.y, tile.getStackHeight() + (tile.state == RoomTileState.SIT ? -0.5 : 0), roomUnit.getEffectId()), WiredHandler.TELEPORT_DELAY);
HabboItem topItem = room.getTopItemAt(tile.x, tile.y);
if(topItem != null) {
Emulator.getThreading().run(new Runnable() { Emulator.getThreading().run(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
if(roomUnit != null && roomUnit.getRoom() != null) { if(roomUnit == null || roomUnit.getRoom() == null)
return;
HabboItem topItem = room.getTopItemAt(roomUnit.getX(), roomUnit.getY());
if (topItem != null && roomUnit.getCurrentLocation().equals(room.getLayout().getTile(topItem.getX(), topItem.getY()))) {
topItem.onWalkOn(roomUnit, room, new Object[]{}); topItem.onWalkOn(roomUnit, room, new Object[]{});
} }
} catch (Exception e) { } catch (Exception e) {
@ -170,8 +168,6 @@ public class WiredEffectTeleport extends InteractionWiredEffect
}, WiredHandler.TELEPORT_DELAY); }, WiredHandler.TELEPORT_DELAY);
} }
}
@Override @Override
public boolean execute(RoomUnit roomUnit, Room room, Object[] stuff) public boolean execute(RoomUnit roomUnit, Room room, Object[] stuff)
{ {