diff --git a/Server/src/main/java/core/game/interaction/player/LoginValidationPlugin.java b/Server/src/main/java/core/game/interaction/player/LoginValidationPlugin.java index fa71c8f97..e9dad37f2 100644 --- a/Server/src/main/java/core/game/interaction/player/LoginValidationPlugin.java +++ b/Server/src/main/java/core/game/interaction/player/LoginValidationPlugin.java @@ -1,16 +1,16 @@ package core.game.interaction.player; -import java.util.concurrent.TimeUnit; - import core.game.content.activity.ActivityManager; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.SystemManager; -import rs09.game.world.GameWorld; +import core.plugin.Initializable; import core.plugin.Plugin; import core.plugin.PluginManifest; -import core.plugin.Initializable; import core.plugin.PluginType; +import rs09.game.world.GameWorld; + +import java.util.concurrent.TimeUnit; /** * Validates a player login. @@ -59,7 +59,6 @@ public final class LoginValidationPlugin implements Plugin { if (player.getAttribute("falconry", false)) { ActivityManager.start(player, "falconry", true); } - player.getConfigManager().set(678, 5);// RFD if (player.getSavedData().getQuestData().getDragonSlayerAttribute("repaired")) { player.getConfigManager().set(177, 1967876); } diff --git a/Server/src/main/kotlin/rs09/game/system/command/CommandSystem.kt b/Server/src/main/kotlin/rs09/game/system/command/CommandSystem.kt index e735ddd2f..a1a4b5a38 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/CommandSystem.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/CommandSystem.kt @@ -25,7 +25,9 @@ class CommandSystem { } } } else { - command.attemptHandling(player,arguments) + try { + command.attemptHandling(player, arguments) + } catch (e: IllegalStateException){return true} } return false } diff --git a/Server/src/main/kotlin/rs09/game/system/command/sets/CommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/CommandSet.kt index cdc9e0559..66c74fd99 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/sets/CommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/CommandSet.kt @@ -28,10 +28,19 @@ abstract class CommandSet(val defaultPrivilege: Command.Privilege) : Plugin$message")) } /**