nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-23 07:20:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix wired teleport loop continuing after left room

Browse Source
This commit is contained in:
Beny 2019-05-23 15:03:40 +01:00
parent 7e5cf51fba
commit b0601b93dd
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package com.eu.habbo.habbohotel.items.interactions.wired.effects;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.items.Item;
import com.eu.habbo.habbohotel.items.interactions.InteractionTeleportTile;
import com.eu.habbo.habbohotel.items.interactions.InteractionWiredEffect; import com.eu.habbo.habbohotel.items.interactions.InteractionWiredEffect;
import com.eu.habbo.habbohotel.items.interactions.InteractionWiredTrigger; import com.eu.habbo.habbohotel.items.interactions.InteractionWiredTrigger;
import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.Room;
@ -160,7 +161,9 @@ public class WiredEffectTeleport extends InteractionWiredEffect
@Override @Override
public void run() { public void run() {
try { try {
topItem.onWalkOn(roomUnit, room, new Object[] { }); if(roomUnit != null && roomUnit.getRoom() != null) {
topItem.onWalkOn(roomUnit, room, new Object[]{});
}
} catch (Exception e) { } catch (Exception e) {
} }
} }

6
src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
View File

@ -705,8 +705,14 @@ public class RoomManager
r.removeFromQueue(habbo); r.removeFromQueue(habbo);
} }
} }
habbo.getHabboInfo().setRoomQueueId(0); habbo.getHabboInfo().setRoomQueueId(0);
habbo.getClient().sendResponse(new HideDoorbellComposer("")); habbo.getClient().sendResponse(new HideDoorbellComposer(""));
if(habbo.getRoomUnit() != null) {
habbo.getRoomUnit().setRoom(null);
}
habbo.setRoomUnit(new RoomUnit()); habbo.setRoomUnit(new RoomUnit());
habbo.getRoomUnit().clearStatus(); habbo.getRoomUnit().clearStatus();

4
src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java
View File

@ -833,4 +833,8 @@ public class RoomUnit
public void setCanLeaveRoomByDoor(boolean canLeaveRoomByDoor) { public void setCanLeaveRoomByDoor(boolean canLeaveRoomByDoor) {
this.canLeaveRoomByDoor = canLeaveRoomByDoor; this.canLeaveRoomByDoor = canLeaveRoomByDoor;
} }
public void setRoom(Room room) {
this.room = room;
}
} }

10
src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java
View File

@ -34,6 +34,9 @@ public class RoomUnitTeleport implements Runnable
@Override @Override
public void run() public void run()
{ {
if(roomUnit == null || roomUnit.getRoom() == null)
return;
RoomTile t = this.room.getLayout().getTile((short) this.x, (short) this.y); RoomTile t = this.room.getLayout().getTile((short) this.x, (short) this.y);
HabboItem topItem = this.room.getTopItemAt(this.roomUnit.getCurrentLocation().x, this.roomUnit.getCurrentLocation().y); HabboItem topItem = this.room.getTopItemAt(this.roomUnit.getCurrentLocation().x, this.roomUnit.getCurrentLocation().y);
@ -58,13 +61,6 @@ public class RoomUnitTeleport implements Runnable
this.roomUnit.setLocation(t); this.roomUnit.setLocation(t);
this.room.sendComposer(teleportMessage); this.room.sendComposer(teleportMessage);
this.room.updateHabbosAt(t.x, t.y); this.room.updateHabbosAt(t.x, t.y);
} }
} }