From f67c03df8ef265efd7bab7dd0a2191dc7a6f05db Mon Sep 17 00:00:00 2001
From: necmi <183-necmi@users.noreply.git.krews.org>
Date: Sat, 11 Jul 2020 06:02:21 +0200
Subject: [PATCH] fixed multiple bots on one tile and refactored code

---
 src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java   | 5 +++++
 src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java | 2 +-
 .../generic/alerts/GenericErrorMessagesComposer.java         | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java b/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java
index a716e4e1..ee364c4f 100644
--- a/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java
+++ b/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java
@@ -122,6 +122,11 @@ public class BotManager {
                 if (room.hasHabbosAt(location.x, location.y) || (!location.isWalkable() && location.state != RoomTileState.SIT && location.state != RoomTileState.LAY))
                     return;
 
+                if (room.hasBotsAt(location.x, location.y)) {
+                    habbo.getClient().sendResponse(new BotErrorComposer(BotErrorComposer.ROOM_ERROR_BOTS_SELECTED_TILE_NOT_FREE));
+                    return;
+                }
+
                 RoomUnit roomUnit = new RoomUnit();
                 roomUnit.setRotation(RoomUserRotation.SOUTH);
                 roomUnit.setLocation(location);
diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
index 32fc0cfb..73a29cab 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
@@ -559,7 +559,7 @@ public class RoomManager {
             if (room.getPassword().equalsIgnoreCase(password))
                 this.openRoom(habbo, room, doorLocation);
             else {
-                habbo.getClient().sendResponse(new GenericErrorMessagesComposer(-100002));
+                habbo.getClient().sendResponse(new GenericErrorMessagesComposer(GenericErrorMessagesComposer.WRONG_PASSWORD_USED));
                 habbo.getClient().sendResponse(new HotelViewComposer());
                 habbo.getHabboInfo().setLoadingRoom(0);
             }
diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java
index 2674f7d0..7757cdd6 100644
--- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java
+++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java
@@ -11,6 +11,7 @@ public class GenericErrorMessagesComposer extends MessageComposer {
     public static final int NEED_TO_BE_VIP = 4009;
     public static final int ROOM_NAME_UNACCEPTABLE = 4010;
     public static final int CANNOT_BAN_GROUP_MEMBER = 4011;
+    public static final int WRONG_PASSWORD_USED = -100002;
 
     private final int errorCode;