Merge branch 'fix-floorplaneditor' into 'dev'

add null check

See merge request morningstar/Arcturus-Community!549
This commit is contained in:
Harmonic 2022-04-15 21:50:52 +00:00
commit 098d6a6684

View File

@ -121,7 +121,7 @@ public class FloorPlanEditorSaveEvent extends MessageHandler {
}
}
if (tile.state != RoomTileState.INVALID && height != tile.z && room.getTopItemAt(x, y) != null) {
if (tile != null && tile.state != RoomTileState.INVALID && height != tile.z && room.getTopItemAt(x, y) != null) {
errors.add("${notification.floorplan_editor.error.message.change_blocked_by_room_item}");
break blockingRoomItemScan;
}