From d34707ec94711d2cd9b4244a9b330bc83a76e521 Mon Sep 17 00:00:00 2001
From: DuckieTM <info@camwijs.nl>
Date: Wed, 3 Apr 2024 23:39:19 +0200
Subject: [PATCH] 2 small fixes from ArpyAge

---
 .../java/com/eu/habbo/habbohotel/rooms/RoomManager.java     | 6 +++++-
 .../java/com/eu/habbo/habbohotel/wired/WiredHandler.java    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
index 972b001..3947d21 100644
--- a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
+++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
@@ -291,6 +291,10 @@ public class RoomManager {
     public Room loadRoom(int id, boolean loadData) {
         Room room = null;
 
+        if(id == 0) {
+            return null;
+        }
+
         if (this.activeRooms.containsKey(id)) {
             room = this.activeRooms.get(id);
 
@@ -411,7 +415,7 @@ public class RoomManager {
 
     public RoomLayout loadLayout(String name, Room room) {
         RoomLayout layout = null;
-        try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("SELECT * FROM room_models WHERE name LIKE ? LIMIT 1")) {
+        try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("SELECT * FROM room_models WHERE name = ? LIMIT 1")) {
             statement.setString(1, name);
             try (ResultSet set = statement.executeQuery()) {
                 if (set.next()) {
diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java
index a3a2a17..bb48b94 100644
--- a/Emulator/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java
+++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java
@@ -232,7 +232,7 @@ public class WiredHandler {
             executed = true;
             if (!effect.requiresTriggeringUser() || (roomUnit != null && effect.requiresTriggeringUser())) {
                 Emulator.getThreading().run(() -> {
-                    if (room.isLoaded()) {
+                    if (room.isLoaded() && room.getHabbos().size() > 0) {
                         try {
                             if (!effect.execute(roomUnit, room, stuff)) return;
                             effect.setCooldown(millis);