diff --git a/src/main/java/com/mraof/minestuck/player/Echeladder.java b/src/main/java/com/mraof/minestuck/player/Echeladder.java
index 929f8cfe6f..d9e512f309 100644
--- a/src/main/java/com/mraof/minestuck/player/Echeladder.java
+++ b/src/main/java/com/mraof/minestuck/player/Echeladder.java
@@ -69,6 +69,16 @@ public static Echeladder get(PlayerData playerData)
 		return playerData.getData(MSCapabilities.ECHELADDER);
 	}
 	
+	@SubscribeEvent
+	private static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event)
+	{
+		ServerPlayer player = (ServerPlayer) event.getEntity();
+		
+		Echeladder echeladder = get(player);
+		echeladder.updateEcheladderBonuses(player);
+		echeladder.sendInitialPacket(player);
+	}
+	
 	@SubscribeEvent
 	private static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event)
 	{
@@ -306,4 +316,4 @@ public static String translationKey(int rung)
 	{
 		return "echeladder.rung." + rung;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/mraof/minestuck/player/GristCache.java b/src/main/java/com/mraof/minestuck/player/GristCache.java
index 50dd4ed966..1cd45e687e 100644
--- a/src/main/java/com/mraof/minestuck/player/GristCache.java
+++ b/src/main/java/com/mraof/minestuck/player/GristCache.java
@@ -81,9 +81,7 @@ private static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event)
 	{
 		ServerPlayer player = (ServerPlayer) event.getEntity();
 		
-		PlayerData playerData = PlayerSavedData.getData(player);
-		if(playerData != null)
-			get(playerData).sendPacket(player);
+		get(player).sendPacket(player);
 	}
 	
 	/**
diff --git a/src/main/java/com/mraof/minestuck/player/PlayerBoondollars.java b/src/main/java/com/mraof/minestuck/player/PlayerBoondollars.java
index 04b1eb222b..d2aa4e0ab5 100644
--- a/src/main/java/com/mraof/minestuck/player/PlayerBoondollars.java
+++ b/src/main/java/com/mraof/minestuck/player/PlayerBoondollars.java
@@ -8,6 +8,8 @@
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 
+import java.util.Objects;
+
 @Mod.EventBusSubscriber(modid = Minestuck.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE)
 public final class PlayerBoondollars
 {
@@ -63,9 +65,8 @@ private static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event)
 	{
 		ServerPlayer player = (ServerPlayer) event.getEntity();
 		
-		PlayerData playerData = PlayerSavedData.getData(player);
-		if(playerData != null)
-			PlayerBoondollars.sendBoondollars(player, playerData);
+		PlayerData playerData = Objects.requireNonNull(PlayerSavedData.getData(player));
+		PlayerBoondollars.sendBoondollars(player, playerData);
 	}
 	
 	private static void sendBoondollars(ServerPlayer player, PlayerData playerData)
diff --git a/src/main/java/com/mraof/minestuck/player/PlayerData.java b/src/main/java/com/mraof/minestuck/player/PlayerData.java
index df11ac1abc..d3615fbceb 100644
--- a/src/main/java/com/mraof/minestuck/player/PlayerData.java
+++ b/src/main/java/com/mraof/minestuck/player/PlayerData.java
@@ -182,15 +182,11 @@ private void tryGiveStartingModus(ServerPlayer player)
 	
 	public void onPlayerLoggedIn(ServerPlayer player)
 	{
-		Echeladder.get(this).updateEcheladderBonuses(player);
-		
 		if(getModus() != null)
 			PacketDistributor.PLAYER.with(player).send(ModusDataPacket.create(getModus()));
 		
 		if(getModus() == null && !hasGivenModus())
 			tryGiveStartingModus(player);
-		
-		Echeladder.get(this).sendInitialPacket(player);
 	}
 	
 	@Nullable