diff --git a/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java b/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java
index da9c8d3ae..fe3618759 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java
@@ -36,7 +36,8 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 		this.sendPluginPacketServer((ServerPlayer) serverPlayer.getWrappedMcObject(), message);
 	}
 	
-	@Override public abstract void sendPluginPacketClient(NetworkMessage message);
+	@Override
+	public abstract void sendPluginPacketClient(NetworkMessage message);
 	public abstract void sendPluginPacketServer(ServerPlayer serverPlayer, NetworkMessage message);
 	
 	@Nullable
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java
index ce8bd183b..81772d44e 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java
@@ -22,7 +22,6 @@ package com.seibel.distanthorizons.common.wrappers.minecraft;
 import java.io.File;
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.UUID;
 
 import com.mojang.blaze3d.platform.NativeImage;
@@ -32,7 +31,6 @@ import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.enums.EDhDirection;
-import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java
index 7b3867515..22d34e821 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java
@@ -1,81 +1,112 @@
 package com.seibel.distanthorizons.common.wrappers.misc;
 
+import com.google.common.base.Objects;
 import com.google.common.collect.MapMaker;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
 import com.seibel.distanthorizons.coreapi.util.math.Vec3d;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.ServerPlayerConnection;
 import net.minecraft.world.phys.Vec3;
 
 import java.net.SocketAddress;
-import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;
 
+/**
+ * This wrapper transparently ensures that underlying {@link ServerPlayer} is always valid,
+ * unless the player has disconnected.
+ */
 public class ServerPlayerWrapper implements IServerPlayerWrapper
 {
-	private static final ConcurrentMap<ServerPlayer, ServerPlayerWrapper>
-			serverPlayerWrapperMap = new MapMaker().weakKeys().makeMap();
-
-	private final ServerPlayer serverPlayer;
-
+	private static final ConcurrentMap<ServerPlayerConnection, ServerPlayerWrapper> serverPlayerWrapperMap = new MapMaker().weakKeys().weakValues().makeMap();
+	
+	private final ServerPlayerConnection connection;
+	private ServerPlayer serverPlayer()
+	{
+		return this.connection.getPlayer();
+	}
+	
 	public static ServerPlayerWrapper getWrapper(ServerPlayer serverPlayer)
 	{
-		return serverPlayerWrapperMap.computeIfAbsent(serverPlayer, ServerPlayerWrapper::new);
+		return serverPlayerWrapperMap.computeIfAbsent(serverPlayer.connection, ignored -> new ServerPlayerWrapper(serverPlayer));
 	}
-
+	
 	private ServerPlayerWrapper(ServerPlayer serverPlayer)
 	{
-		this.serverPlayer = serverPlayer;
+		this.connection = serverPlayer.connection;
 	}
 	
+	
 	@Override
 	public String getName()
 	{
-		return this.serverPlayer.getName().getString();
+		return this.serverPlayer().getName().getString();
 	}
 	
 	@Override
 	public IServerLevelWrapper getLevel()
 	{
 		#if MC_VER < MC_1_20_1
-		return ServerLevelWrapper.getWrapper(this.serverPlayer.getLevel());
+		return ServerLevelWrapper.getWrapper(this.serverPlayer().getLevel());
 		#else
-		return ServerLevelWrapper.getWrapper(this.serverPlayer.serverLevel());
+		return ServerLevelWrapper.getWrapper(this.serverPlayer().serverLevel());
 		#endif
-    }
+	}
 	
 	@Override
 	public Vec3d getPosition()
 	{
-		Vec3 position = this.serverPlayer.position();
-        return new Vec3d(position.x, position.y, position.z);
-    }
+		Vec3 position = this.serverPlayer().position();
+		return new Vec3d(position.x, position.y, position.z);
+	}
 	
 	@Override
 	public int getViewDistance()
 	{
-		return this.serverPlayer.server.getPlayerList().getViewDistance();
+		return this.serverPlayer().server.getPlayerList().getViewDistance();
 	}
 	
 	@Override
 	public SocketAddress getRemoteAddress()
 	{
 		#if MC_VER >= MC_1_19_4
-		return this.serverPlayer.connection.getRemoteAddress();
+		return this.serverPlayer().connection.getRemoteAddress();
 		#else // < 1.19.4
-		return this.serverPlayer.connection.connection.getRemoteAddress();
+		return this.serverPlayer().connection.connection.getRemoteAddress();
 		#endif
 	}
 	
 	@Override
 	public Object getWrappedMcObject()
 	{
-		return this.serverPlayer;
-    }
-
-    @Override
-    public String toString() {
-	    return "Wrapped{" + this.serverPlayer.toString() + "}";
-    }
+		return this.serverPlayer();
+	}
+	
+	@Override
+	public String toString()
+	{
+		return "Wrapped{" + this.serverPlayer() + "}";
+	}
+	
+	@Override
+	public boolean equals(Object o)
+	{
+		if (this == o)
+		{
+			return true;
+		}
+		if (!(o instanceof ServerPlayerWrapper that))
+		{
+			return false;
+		}
+		return Objects.equal(this.connection, that.connection);
+	}
+	
+	@Override
+	public int hashCode()
+	{
+		return Objects.hashCode(this.connection);
+	}
+	
 }
\ No newline at end of file
diff --git a/coreSubProjects b/coreSubProjects
index 85341f7a6..af6967854 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 85341f7a6d91dbff07a80e2442225b238e8a4739
+Subproject commit af6967854529953ae3c97c6d6077657806cebe35