From a25ac7f0fc3418c692c856b8dcff28830e4dbcda Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Tue, 11 Nov 2025 17:52:49 +0100
Subject: [PATCH] ryan fixes

---
 .../core/game/node/entity/player/Player.java  |  2 -
 .../entity/player/info/login/LoginParser.kt   | 45 +++++++++----------
 2 files changed, 20 insertions(+), 27 deletions(-)

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 05867a01d..369082a8a 100644
--- a/Server/src/main/core/game/node/entity/player/Player.java
+++ b/Server/src/main/core/game/node/entity/player/Player.java
@@ -7,7 +7,6 @@ import core.api.ContentAPIKt;
 import core.api.EquipmentSlot;
 import core.game.component.Component;
 import core.game.container.Container;
-import core.game.container.ContainerType;
 import core.game.container.impl.BankContainer;
 import core.game.container.impl.EquipmentContainer;
 import core.game.container.impl.InventoryListener;
@@ -328,7 +327,6 @@ public class Player extends Entity {
 	public void init() {
 		if (!artificial) {
 			log(this.getClass(), Log.INFO, getUsername() + " initialising...");
-			getDetails().getSession().setObject(this);
 		}
 		super.init();
 		LoginConfiguration.configureLobby(this);
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)
+        }
     }
 
     /**