nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-07-02 13:35:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor floor plan editor saving

Browse Source
This commit is contained in:
Alejandro 2019-07-24 15:59:20 +03:00
parent f4e1ba57f8
commit 806d747d3b
2 changed files with 28 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/eu/habbo/Emulator.java
View File

@ -18,10 +18,7 @@ import com.eu.habbo.plugin.events.emulator.EmulatorStoppedEvent;
import com.eu.habbo.threading.ThreadPooling; import com.eu.habbo.threading.ThreadPooling;
import com.eu.habbo.util.imager.badges.BadgeImager; import com.eu.habbo.util.imager.badges.BadgeImager;
import java.io.BufferedReader; import java.io.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -157,7 +154,9 @@ public final class Emulator {
} }
System.out.println("Waiting for command: "); System.out.println("Waiting for command: ");
} catch (Exception e) { } catch (Exception e) {
Emulator.getLogging().logErrorLine(e); if (!(e instanceof IOException && e.getMessage().equals("Bad file descriptor"))) {
Emulator.getLogging().logErrorLine(e);
}
} }
} }
} catch (Exception e) { } catch (Exception e) {

90
src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java
View File

@ -13,14 +13,11 @@ import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer;
import java.util.ArrayList; import java.util.*;
import java.util.Collection;
import java.util.List;
public class FloorPlanEditorSaveEvent extends MessageHandler { public class FloorPlanEditorSaveEvent extends MessageHandler {
public static int MAXIMUM_FLOORPLAN_WIDTH_LENGTH = 64; public static int MAXIMUM_FLOORPLAN_WIDTH_LENGTH = 64;
public static int MAXIMUM_FLOORPLAN_SIZE = 64 * 64; public static int MAXIMUM_FLOORPLAN_SIZE = 64 * 64;
public static final String VALID_CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
@Override @Override
public void handle() throws Exception { public void handle() throws Exception {
@ -35,81 +32,46 @@ public class FloorPlanEditorSaveEvent extends MessageHandler {
return; return;
if (room.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || this.client.getHabbo().hasPermission(Permission.ACC_ANYROOMOWNER)) { if (room.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || this.client.getHabbo().hasPermission(Permission.ACC_ANYROOMOWNER)) {
List<String> errors = new ArrayList<>(); StringJoiner errors = new StringJoiner("<br />");
String map = this.packet.readString(); String map = this.packet.readString();
map = map.replace("X", "x"); map = map.replace("X", "x");
String checkMap = map.replace(((char) 13) + "", "").toUpperCase(); String[] mapRows = map.split("\r");
for (char c : VALID_CHARACTERS.toCharArray())
{
checkMap = checkMap.replace(c + "", "");
}
if (!checkMap.isEmpty() && Emulator.getConfig().getBoolean("hotel.room.floorplan.check.enabled")) int firstRowSize = mapRows[0].length();
{
errors.add("${notification.floorplan_editor.error.title}");
}
boolean rowCountCorrect = true; if (Emulator.getConfig().getBoolean("hotel.room.floorplan.check.enabled")) {
int rowCount = 0; if (!map.matches("[a-zA-Z0-9\r]+")) errors.add("${notification.floorplan_editor.error.title}");
String[] splitMap = map.split(((char) 13) + "");
for (String s : splitMap) { Arrays.stream(mapRows)
if(rowCount > 0 && rowCount != s.length()) { .filter(line -> line.length() != firstRowSize)
rowCountCorrect = false; .findAny()
.ifPresent(s -> errors.add("(General): Line " + (Arrays.asList(mapRows).indexOf(s) + 1) + " is of different length than line 1"));
if (map.isEmpty() || map.replace("x", "").replace("\r", "").isEmpty()) {
errors.add("${notification.floorplan_editor.error.message.effective_height_is_0}");
} }
rowCount = s.length();
}
if (!rowCountCorrect && Emulator.getConfig().getBoolean("hotel.room.floorplan.check.enabled"))
{
errors.add("Invalid Rowcount");
}
if (map.isEmpty() || map.replace("x", "").replace(((char) 13) + "", "").length() == 0) {
errors.add("${notification.floorplan_editor.error.message.effective_height_is_0}");
}
int lengthX = -1;
int lengthY = -1;
String[] data = map.split(((char) 13) + "");
if (errors.isEmpty()) {
if (map.length() > 64 * 64) { if (map.length() > 64 * 64) {
errors.add("${notification.floorplan_editor.error.message.too_large_area}"); errors.add("${notification.floorplan_editor.error.message.too_large_area}");
} }
if (mapRows.length > 64) errors.add("${notification.floorplan_editor.error.message.too_large_height}");
lengthY = data.length; else if (Arrays.stream(mapRows).anyMatch(l -> l.length() > 64 || l.length() == 0)) errors.add("${notification.floorplan_editor.error.message.too_large_width}");
if (data.length > 64) {
errors.add("${notification.floorplan_editor.error.message.too_large_height}");
} else {
for (String s : data) {
if (lengthX == -1) {
lengthX = s.length();
}
if (s.length() != lengthX) {
break;
}
if (s.length() > 64 || s.length() == 0) {
errors.add("${notification.floorplan_editor.error.message.too_large_width}");
}
}
}
} }
int doorX = this.packet.readInt(); int doorX = this.packet.readInt();
int doorY = this.packet.readInt(); int doorY = this.packet.readInt();
if (doorX < 0 || doorX > lengthX || doorY < 0 || doorY > lengthY || data[doorY].charAt(doorX) == 'x') { if (doorX < 0 || doorX > firstRowSize || doorY < 0 || doorY >= mapRows.length) {
errors.add("${notification.floorplan_editor.error.message.entry_tile_outside_map}"); errors.add("${notification.floorplan_editor.error.message.entry_tile_outside_map}");
} }
int doorRotation = this.packet.readInt(); if (doorY < mapRows.length && doorX < mapRows[doorY].length() && mapRows[doorY].charAt(doorX) == 'x') {
errors.add("${notification.floorplan_editor.error.message.entry_not_on_tile}");
}
int doorRotation = this.packet.readInt();
if (doorRotation < 0 || doorRotation > 7) { if (doorRotation < 0 || doorRotation > 7) {
errors.add("${notification.floorplan_editor.error.message.invalid_entry_tile_direction}"); errors.add("${notification.floorplan_editor.error.message.invalid_entry_tile_direction}");
} }
@ -123,8 +85,8 @@ public class FloorPlanEditorSaveEvent extends MessageHandler {
if (floorSize < -2 || floorSize > 1) { if (floorSize < -2 || floorSize > 1) {
errors.add("${notification.floorplan_editor.error.message.invalid_floor_thickness}"); errors.add("${notification.floorplan_editor.error.message.invalid_floor_thickness}");
} }
int wallHeight = -1;
int wallHeight = -1;
if (this.packet.bytesAvailable() >= 4) if (this.packet.bytesAvailable() >= 4)
wallHeight = this.packet.readInt(); wallHeight = this.packet.readInt();
@ -132,12 +94,8 @@ public class FloorPlanEditorSaveEvent extends MessageHandler {
errors.add("${notification.floorplan_editor.error.message.invalid_walls_fixed_height}"); errors.add("${notification.floorplan_editor.error.message.invalid_walls_fixed_height}");
} }
if (!errors.isEmpty()) { if (errors.length() > 0) {
StringBuilder errorMessage = new StringBuilder(); this.client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FLOORPLAN_EDITOR_ERROR.key, errors.toString()));
for (String s : errors) {
errorMessage.append(s).append("<br />");
}
this.client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FLOORPLAN_EDITOR_ERROR.key, errorMessage.toString()));
return; return;
} }