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

Make sure that users' RoomUnit is removed upon exiting

Browse Source
This commit is contained in:
Alejandro 2019-05-30 21:16:43 +03:00
parent 25d8ffba96
commit e21b4ceced
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -617,7 +617,7 @@ public class RoomManager {
habbo.getRoomUnit().setInRoom(true); habbo.getRoomUnit().setInRoom(true);
if (habbo.getHabboInfo().getCurrentRoom() != room && habbo.getHabboInfo().getCurrentRoom() != null) { if (habbo.getHabboInfo().getCurrentRoom() != room && habbo.getHabboInfo().getCurrentRoom() != null) {
habbo.getHabboInfo().getCurrentRoom().removeHabbo(habbo); habbo.getHabboInfo().getCurrentRoom().removeHabbo(habbo, true);
} else if (!habbo.getHabboStats().blockFollowing && habbo.getHabboInfo().getCurrentRoom() == null) { } else if (!habbo.getHabboStats().blockFollowing && habbo.getHabboInfo().getCurrentRoom() == null) {
habbo.getMessenger().connectionChanged(habbo, true, true); habbo.getMessenger().connectionChanged(habbo, true, true);
} }
@ -1503,7 +1503,7 @@ public class RoomManager {
if (habbo != null) { if (habbo != null) {
if (habbo.getHabboInfo().getCurrentRoom() == room) { if (habbo.getHabboInfo().getCurrentRoom() == room) {
room.removeHabbo(habbo); room.removeHabbo(habbo, true);
habbo.getClient().sendResponse(new RoomEnterErrorComposer(RoomEnterErrorComposer.ROOM_ERROR_BANNED)); habbo.getClient().sendResponse(new RoomEnterErrorComposer(RoomEnterErrorComposer.ROOM_ERROR_BANNED));
} }
} }

2
src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java
View File

@ -67,7 +67,7 @@ class TeleportInteraction extends Thread {
if (this.room != this.targetRoom) { if (this.room != this.targetRoom) {
Emulator.getGameEnvironment().getRoomManager().logExit(this.client.getHabbo()); Emulator.getGameEnvironment().getRoomManager().logExit(this.client.getHabbo());
this.room.removeHabbo(this.client.getHabbo()); this.room.removeHabbo(this.client.getHabbo(), true);
Emulator.getGameEnvironment().getRoomManager().enterRoom(this.client.getHabbo(), this.targetRoom); Emulator.getGameEnvironment().getRoomManager().enterRoom(this.client.getHabbo(), this.targetRoom);
} }