nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2025-01-31 12:22:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev'

Browse Source 
Fix Teleport invisible Bug and 1 user per roller

See merge request morningstar/Arcturus-Community!279
This commit is contained in:
Harmonic 2020-08-27 15:48:13 -04:00
commit 973f918c2e
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
View File

@ -1469,6 +1469,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
if (unit.hasStatus(RoomUnitStatus.SIT)) { if (unit.hasStatus(RoomUnitStatus.SIT)) {
unit.sitUpdate = true; unit.sitUpdate = true;
} }
break;
} }
} }
@ -2610,7 +2611,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
habbo.getRoomUnit().getCurrentLocation().removeUnit(habbo.getRoomUnit()); habbo.getRoomUnit().getCurrentLocation().removeUnit(habbo.getRoomUnit());
} }
if (sendRemovePacket && habbo.getRoomUnit() != null) { if (sendRemovePacket && habbo.getRoomUnit() != null && !habbo.getRoomUnit().isTeleporting) {
this.sendComposer(new RoomUserRemoveComposer(habbo.getRoomUnit()).compose()); this.sendComposer(new RoomUserRemoveComposer(habbo.getRoomUnit()).compose());
} }

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

@ -586,11 +586,11 @@ public class RoomManager {
habbo.getClient().sendResponse(new HideDoorbellComposer("")); habbo.getClient().sendResponse(new HideDoorbellComposer(""));
if (habbo.getRoomUnit() != null) { if (habbo.getRoomUnit() != null) {
Room existingRoom = habbo.getRoomUnit().getRoom(); RoomUnit existingRoom = habbo.getRoomUnit();
if (existingRoom != null) { if (existingRoom.getRoom() != null) {
if (habbo.getRoomUnit().getCurrentLocation() != null) if (existingRoom.getCurrentLocation() != null)
habbo.getRoomUnit().getCurrentLocation().removeUnit(habbo.getRoomUnit()); existingRoom.getCurrentLocation().removeUnit(existingRoom);
habbo.getRoomUnit().getRoom().sendComposer(new RoomUserRemoveComposer(habbo.getRoomUnit()).compose()); existingRoom.getRoom().sendComposer(new RoomUserRemoveComposer(existingRoom).compose());
} }
habbo.getRoomUnit().setRoom(null); habbo.getRoomUnit().setRoom(null);
} }

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

@ -59,7 +59,7 @@ class TeleportActionThree implements Runnable {
this.client.getHabbo().getRoomUnit().setRotation(RoomUserRotation.values()[targetTeleport.getRotation() % 8]); this.client.getHabbo().getRoomUnit().setRotation(RoomUserRotation.values()[targetTeleport.getRotation() % 8]);
if (targetRoom != this.room) { if (targetRoom != this.room) {
this.room.removeHabbo(this.client.getHabbo(), true); this.room.removeHabbo(this.client.getHabbo(), false);
Emulator.getGameEnvironment().getRoomManager().enterRoom(this.client.getHabbo(), targetRoom.getId(), "", Emulator.getConfig().getBoolean("hotel.teleport.locked.allowed"), teleportLocation); Emulator.getGameEnvironment().getRoomManager().enterRoom(this.client.getHabbo(), targetRoom.getId(), "", Emulator.getConfig().getBoolean("hotel.teleport.locked.allowed"), teleportLocation);
} }