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

Fix NPE caused by Room.removeHabbo

Browse Source
This commit is contained in:
Alejandro 2020-02-27 22:35:03 +02:00
parent 166d8e8f40
commit ece55786d8
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -570,6 +570,9 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
HabboItem lowestChair = this.getLowestChair(tile); HabboItem lowestChair = this.getLowestChair(tile);
THashSet<HabboItem> items = this.getItemsAt(tile); THashSet<HabboItem> items = this.getItemsAt(tile);
if (items == null) return RoomTileState.INVALID; if (items == null) return RoomTileState.INVALID;
if (items.stream().anyMatch(i -> i.getBaseItem().allowLay())) return RoomTileState.LAY;
for (HabboItem item : items) { for (HabboItem item : items) {
if (exclude != null && item == exclude) continue; if (exclude != null && item == exclude) continue;
@ -853,10 +856,11 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
return; return;
if (this.loaded) { if (this.loaded) {
if (!this.traxManager.disposed()) {
this.traxManager.dispose();
}
try { try {
if (!this.traxManager.disposed()) {
this.traxManager.dispose();
}
this.roomCycleTask.cancel(false); this.roomCycleTask.cancel(false);
this.scheduledTasks.clear(); this.scheduledTasks.clear();
this.scheduledComposers.clear(); this.scheduledComposers.clear();
@ -936,12 +940,16 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
} }
} }
this.wordQuiz = ""; try {
this.yesVotes = 0; this.wordQuiz = "";
this.noVotes = 0; this.yesVotes = 0;
this.updateDatabaseUserCount(); this.noVotes = 0;
this.preLoaded = true; this.updateDatabaseUserCount();
this.layout = null; this.preLoaded = true;
this.layout = null;
} catch (Exception e) {
Emulator.getLogging().logErrorLine(e);
}
} }
Emulator.getPluginManager().fireEvent(new RoomUnloadedEvent(this)); Emulator.getPluginManager().fireEvent(new RoomUnloadedEvent(this));
@ -2598,13 +2606,15 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
this.sendComposer(new RoomUserRemoveComposer(habbo.getRoomUnit()).compose()); this.sendComposer(new RoomUserRemoveComposer(habbo.getRoomUnit()).compose());
} }
HabboItem item = this.getTopItemAt(habbo.getRoomUnit().getX(), habbo.getRoomUnit().getY()); if (habbo.getRoomUnit().getCurrentLocation() != null) {
HabboItem item = this.getTopItemAt(habbo.getRoomUnit().getX(), habbo.getRoomUnit().getY());
if (item != null) { if (item != null) {
try { try {
item.onWalkOff(habbo.getRoomUnit(), this, new Object[]{}); item.onWalkOff(habbo.getRoomUnit(), this, new Object[]{});
} catch (Exception e) { } catch (Exception e) {
Emulator.getLogging().logErrorLine(e); Emulator.getLogging().logErrorLine(e);
}
} }
} }