You've already forked Arcturus-Morningstar-Extended
mirror of
https://github.com/duckietm/Arcturus-Morningstar-Extended.git
synced 2026-06-19 15:06:19 +00:00
🆙 Added null check to wall /floor and background
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
-- Fix NULL room paint columns
|
||||
--
|
||||
-- Some legacy/imported rooms have NULL in paper_wall / paper_floor / paper_landscape.
|
||||
-- The server compares these with .equals("0.0") on room entry, which throws a
|
||||
-- NullPointerException (RoomManager.openRoom) and prevents the room from loading.
|
||||
-- This normalizes existing NULL values and re-enforces the NOT NULL DEFAULT '0.0'
|
||||
-- constraint so it cannot happen again.
|
||||
|
||||
UPDATE `rooms` SET `paper_wall` = '0.0' WHERE `paper_wall` IS NULL;
|
||||
UPDATE `rooms` SET `paper_floor` = '0.0' WHERE `paper_floor` IS NULL;
|
||||
UPDATE `rooms` SET `paper_landscape` = '0.0' WHERE `paper_landscape` IS NULL;
|
||||
|
||||
ALTER TABLE `rooms` MODIFY COLUMN `paper_wall` VARCHAR(50) NOT NULL DEFAULT '0.0';
|
||||
ALTER TABLE `rooms` MODIFY COLUMN `paper_floor` VARCHAR(50) NOT NULL DEFAULT '0.0';
|
||||
ALTER TABLE `rooms` MODIFY COLUMN `paper_landscape` VARCHAR(50) NOT NULL DEFAULT '0.0';
|
||||
@@ -239,9 +239,9 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
|
||||
this.usersMax = set.getInt("users_max");
|
||||
this.score = set.getInt("score");
|
||||
this.category = set.getInt("category");
|
||||
this.floorPaint = set.getString("paper_floor");
|
||||
this.wallPaint = set.getString("paper_wall");
|
||||
this.backgroundPaint = set.getString("paper_landscape");
|
||||
this.floorPaint = set.getString("paper_floor") == null ? "0.0" : set.getString("paper_floor");
|
||||
this.wallPaint = set.getString("paper_wall") == null ? "0.0" : set.getString("paper_wall");
|
||||
this.backgroundPaint = set.getString("paper_landscape") == null ? "0.0" : set.getString("paper_landscape");
|
||||
this.wallSize = set.getInt("thickness_wall");
|
||||
this.wallHeight = set.getInt("wall_height");
|
||||
this.floorSize = set.getInt("thickness_floor");
|
||||
|
||||
@@ -731,10 +731,10 @@ public class RoomManager {
|
||||
|
||||
habbo.getClient().sendResponse(new RoomModelComposer(room));
|
||||
|
||||
if (!room.getWallPaint().equals("0.0"))
|
||||
if (room.getWallPaint() != null && !room.getWallPaint().equals("0.0"))
|
||||
habbo.getClient().sendResponse(new RoomPaintComposer("wallpaper", room.getWallPaint()));
|
||||
|
||||
if (!room.getFloorPaint().equals("0.0"))
|
||||
if (room.getFloorPaint() != null && !room.getFloorPaint().equals("0.0"))
|
||||
habbo.getClient().sendResponse(new RoomPaintComposer("floor", room.getFloorPaint()));
|
||||
|
||||
habbo.getClient().sendResponse(new RoomPaintComposer("landscape", room.getBackgroundPaint()));
|
||||
|
||||
Reference in New Issue
Block a user