Fix #14, crash on joining world when carrying

CarryCapacity.csproj

@@ -3,7 +3,7 @@
 
 		<AssemblyTitle>CarryCapacity</AssemblyTitle>
 		<Authors>copygirl</Authors>
-		<Version>0.6.5-rc.1</Version>
+		<Version>0.6.5-rc.2</Version>
 
 		<Description>Vintage Story mod which adds the capability to carry various things</Description>
 		<RepositoryUrl>https://github.com/copygirl/CarryCapacity</RepositoryUrl>

resources/modinfo.json

@@ -2,7 +2,7 @@
 	"type": "code",
 	"name": "CarryCapacity",
 	"modid": "carrycapacity",
-	"version": "0.6.5-rc.1",
+	"version": "0.6.5-rc.2",
 
 	"description": "Adds the capability to carry various things",
 	"website": "https://github.com/copygirl/CarryCapacity",

src/Common/CarryHandler.cs

@@ -45,7 +45,8 @@ public void InitServer()
 				.SetMessageHandler<PlaceDownMessage>(OnPlaceDownMessage)
 				.SetMessageHandler<SwapSlotsMessage>(OnSwapSlotsMessage);
 
-			System.ServerAPI.Event.OnEntitySpawn += OnServerEntitySpawn;
+			System.ServerAPI.Event.OnEntitySpawn    += OnServerEntitySpawn;
+			System.ServerAPI.Event.PlayerNowPlaying += OnServerPlayerNowPlaying;
 
 			System.ServerAPI.Event.BeforeActiveSlotChanged +=
 				(player, ev) => OnBeforeActiveSlotChanged(player.Entity, ev);
@@ -54,12 +55,19 @@ public void InitServer()
 
 		public void OnServerEntitySpawn(Entity entity)
 		{
+			// We handle player "spawning" in OnServerPlayerJoin.
+			// If we send a LockSlotsMessage at this point, the client's player is still null.
+			if (entity is EntityPlayer) return;
+
 			// Set this again so walk speed modifiers and animations can be applied.
 			foreach (var carried in entity.GetCarried())
 				carried.Set(entity, carried.Slot);
-
-			// if (entity is EntityPlayer player)
-			// 	player.Controls.OnAction += OnEntityAction;
+		}
+
+		public void OnServerPlayerNowPlaying(IServerPlayer player)
+		{
+			foreach (var carried in player.Entity.GetCarried())
+				carried.Set(player.Entity, carried.Slot);
 		}
 
 
@@ -268,8 +276,8 @@ public EnumHandling OnBeforeActiveSlotChanged(EntityAgent entity, ActiveSlotChan
 				? EnumHandling.PreventDefault
 				: EnumHandling.PassThrough;
 		}
-
-
+		
+		
 		public void OnLockSlotsMessage(LockSlotsMessage message)
 		{
 			var player = System.ClientAPI.World.Player;
@@ -280,7 +288,7 @@ public void OnLockSlotsMessage(LockSlotsMessage message)
 				else LockedItemSlot.Restore(hotbar[i]);
 			}
 		}
-
+		
 		public void SendLockSlotsMessage(IServerPlayer player)
 		{
 			var hotbar = player.InventoryManager.GetHotbarInventory();