duckietm/Arcturus-Morningstar-Extended
1
0
Fork 0
mirror of https://github.com/duckietm/Arcturus-Morningstar-Extended.git synced 2026-06-19 15:06:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #125 from duckietm/dev

Browse Source 
🆙 Small fix floorplan
This commit is contained in:
DuckieTM
2026-05-26 17:15:07 +02:00
committed by GitHub
parent 9328f4a355 4613fbe80c
commit 0a3a940946
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Emulator/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java
+19 -11
View File
@@ -15,7 +15,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.StringJoiner; import java.util.StringJoiner;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -27,7 +26,7 @@ public class FloorPlanEditorSaveEvent extends MessageHandler {
public static int MAXIMUM_FLOORPLAN_SIZE = 64 * 64; public static int MAXIMUM_FLOORPLAN_SIZE = 64 * 64;
private static final int SAVE_COOLDOWN_SECONDS = 3; private static final int SAVE_COOLDOWN_SECONDS = 3;
private static final Pattern ALLOWED_MAP_CHARS = Pattern.compile("[a-qA-Q0-9xX\r]+"); private static final Pattern ALLOWED_MAP_CHARS = Pattern.compile("[a-zA-Z0-9\r]+");
@Override @Override
public int getRatelimit() { public int getRatelimit() {
@@ -135,6 +134,8 @@ public class FloorPlanEditorSaveEvent extends MessageHandler {
THashSet<RoomTile> locked_tileList = room.getLockedTiles(); THashSet<RoomTile> locked_tileList = room.getLockedTiles();
THashSet<RoomTile> new_tileList = new THashSet<>(); THashSet<RoomTile> new_tileList = new THashSet<>();
int blockedX = -1;
int blockedY = -1;
blockingRoomItemScan: blockingRoomItemScan:
for (int y = 0; y < mapRows.length; y++) { for (int y = 0; y < mapRows.length; y++) {
for (int x = 0; x < firstRowSize; x++) { for (int x = 0; x < firstRowSize; x++) {
@@ -145,7 +146,8 @@ public class FloorPlanEditorSaveEvent extends MessageHandler {
short height; short height;
if (square.equalsIgnoreCase("x") && room.getTopItemAt(x, y) != null) { if (square.equalsIgnoreCase("x") && room.getTopItemAt(x, y) != null) {
errors.add("${notification.floorplan_editor.error.message.change_blocked_by_room_item}"); blockedX = x;
blockedY = y;
break blockingRoomItemScan; break blockingRoomItemScan;
} }
@@ -155,30 +157,36 @@ public class FloorPlanEditorSaveEvent extends MessageHandler {
} else if (Emulator.isNumeric(square)) { } else if (Emulator.isNumeric(square)) {
height = Short.parseShort(square); height = Short.parseShort(square);
} else { } else {
int idx = "abcdefghijklmnopq".indexOf(square.toLowerCase()); int idx = "abcdefghijklmnopqrstuvwxyz".indexOf(square.toLowerCase());
if (idx < 0) { if (idx < 0) {
return; return;
} }
height = (short) (10 + idx); height = (short) Math.min(26, 10 + idx);
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return; return;
} }
if (tile != null && 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}"); blockedX = x;
blockedY = y;
break blockingRoomItemScan; break blockingRoomItemScan;
} }
} }
} }
locked_tileList.removeAll(new_tileList); if (blockedX < 0) {
if (!locked_tileList.isEmpty()) { locked_tileList.removeAll(new_tileList);
errors.add("${notification.floorplan_editor.error.message.change_blocked_by_room_item}"); if (!locked_tileList.isEmpty()) {
RoomTile first = locked_tileList.iterator().next();
blockedX = first.x;
blockedY = first.y;
}
} }
if (errors.length() > 0) { if (blockedX >= 0) {
this.client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FLOORPLAN_EDITOR_ERROR.key, errors.toString())); this.client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FLOORPLAN_EDITOR_ERROR.key,
"${notification.floorplan_editor.error.message.change_blocked_by_room_item} (" + blockedX + ", " + blockedY + ")"));
return; return;
} }