diff --git a/Emulator/src/main/java/com/eu/habbo/Emulator.java b/Emulator/src/main/java/com/eu/habbo/Emulator.java index 7a3883af..e793299b 100644 --- a/Emulator/src/main/java/com/eu/habbo/Emulator.java +++ b/Emulator/src/main/java/com/eu/habbo/Emulator.java @@ -36,8 +36,8 @@ public final class Emulator { private static final String OS_NAME = (System.getProperty("os.name") != null ? System.getProperty("os.name") : "Unknown"); private static final String CLASS_PATH = (System.getProperty("java.class.path") != null ? System.getProperty("java.class.path") : "Unknown"); - public final static int MAJOR = 3; - public final static int MINOR = 6; + public final static int MAJOR = 4; + public final static int MINOR = 0; public final static int BUILD = 1; public final static String PREVIEW = ""; @@ -50,7 +50,7 @@ public final class Emulator { "██║╚██╔╝██║██║ ██║██╔══██╗██║╚██╗██║██║██║╚██╗██║██║ ██║╚════██║ ██║ ██╔══██║██╔══██╗\n" + "██║ ╚═╝ ██║╚██████╔╝██║ ██║██║ ╚████║██║██║ ╚████║╚██████╔╝███████║ ██║ ██║ ██║██║ ██║\n" + "╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═══╝╚═╝╚═╝ ╚═══╝ ╚═════╝ ╚══════╝ ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝\n" + - "Still Rocking in 2024.\n"; + "Still Rocking in 2026.\n"; public static String build = ""; public static boolean isReady = false; @@ -106,8 +106,7 @@ public final class Emulator { System.out.println(logo); System.out.println(); - LOGGER.warn("Arcturus Morningstar 3.x is no longer accepting merge requests. Please target MS4 branches if you wish to contribute."); - LOGGER.info("Follow our development at https://git.krews.org/morningstar/Arcturus-Community, "); + LOGGER.info("https://github.com/duckietm/Arcturus-Morningstar-Extended, "); System.out.println(); LOGGER.info("This project is for educational purposes only. This Emulator is an open-source fork of Arcturus created by TheGeneral."); LOGGER.info("Version: {}", version); diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java index 9aaee383..61bc7135 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java @@ -154,6 +154,16 @@ public class Habbo implements Runnable { return false; } + this.habboInfo.setMachineID(this.client.getMachineId()); + + if (Emulator.getGameEnvironment().getModToolManager().hasMACBan(this.client)) { + return false; + } + + if (Emulator.getGameEnvironment().getModToolManager().hasIPBan(this.habboInfo.getIpLogin())) { + return false; + } + this.habboInfo.setMachineID(this.client.getMachineId()); this.isOnline(true);