diff --git a/Server/src/main/core/game/node/entity/player/Player.java b/Server/src/main/core/game/node/entity/player/Player.java index 8d399c864..30a162c64 100644 --- a/Server/src/main/core/game/node/entity/player/Player.java +++ b/Server/src/main/core/game/node/entity/player/Player.java @@ -4,10 +4,13 @@ import content.global.handlers.item.equipment.BarrowsEquipment; import content.global.handlers.item.equipment.special.SalamanderSwingHandler; import content.global.skill.construction.decoration.pohstorage.POHStorageProxyContainer; import content.global.skill.construction.decoration.pohstorage.StorageState; +import content.global.skill.construction.decoration.pohstorage.StorageState; import content.global.skill.runecrafting.PouchManager; import content.global.skill.slayer.SlayerEquipmentFlags; +import content.global.skill.slayer.SlayerEquipmentFlags; import core.api.ContentAPIKt; import core.game.activity.ActivityManager; +import core.game.activity.ActivityManager; import core.game.component.Component; import core.game.container.Container; import core.game.container.impl.BankContainer; diff --git a/Server/src/main/core/game/node/entity/player/info/login/LoginParser.kt b/Server/src/main/core/game/node/entity/player/info/login/LoginParser.kt index 649db34a5..36de9bdba 100644 --- a/Server/src/main/core/game/node/entity/player/info/login/LoginParser.kt +++ b/Server/src/main/core/game/node/entity/player/info/login/LoginParser.kt @@ -33,33 +33,28 @@ class LoginParser(val details: PlayerDetails) { Repository.removePlayer(player) flag(AuthResponse.ErrorLoadingProfile) } - GameWorld.Pulser.submit(object : Pulse(1) { - override fun pulse(): Boolean { - try { - if (details.session.isActive) { - player.properties.spawnLocation = getAttribute(player, "/save:spawnLocation", ServerConstants.HOME_LOCATION) - loginListeners.forEach(Consumer { listener: LoginListener -> listener.login(player) }) //Run our login hooks - parser.runContentHooks() //Run our saved-content-parsing hooks - player.details.session.setObject(player) - player.getDetails().accountInfo.lastUsedIp = player.getDetails().getIpAddress() - if (reconnect) { - reconnect(player) - } else { - flag(AuthResponse.Success) - player.init() - reinitVarps(player) - } - } else { - Repository.removePlayer(player) - } - } catch (t: Throwable) { - t.printStackTrace() - Repository.removePlayer(player) - flag(AuthResponse.ErrorLoadingProfile) + try { + if (details.session.isActive) { + player.properties.spawnLocation = getAttribute(player, "/save:spawnLocation", ServerConstants.HOME_LOCATION) + loginListeners.forEach(Consumer { listener: LoginListener -> listener.login(player) }) //Run our login hooks + parser.runContentHooks() //Run our saved-content-parsing hooks + player.details.session.setObject(player) + player.details.accountInfo.lastUsedIp = player.details.ipAddress + if (reconnect) { + reconnect(player) + } else { + flag(AuthResponse.Success) + player.init() + reinitVarps(player) } - return true + } else { + Repository.removePlayer(player) } - }) + } catch (t: Throwable) { + t.printStackTrace() + Repository.removePlayer(player) + flag(AuthResponse.ErrorLoadingProfile) + } } /**