From dfd8bdab708235b0e27d5219d4f3d0ce02b02a4d Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Mon, 18 Apr 2022 05:46:15 +0200
Subject: [PATCH] Avoid using HeldItem in CreatePlrItems (#4308)

---
 Source/items.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Source/items.cpp b/Source/items.cpp
index dcdec308c..5ba11044c 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -2849,9 +2849,12 @@ void CreatePlrItems(int playerId)
 		InitializeItem(player.InvBody[INVLOC_HAND_RIGHT], IDI_WARRSHLD);
 		GenerateNewSeed(player.InvBody[INVLOC_HAND_RIGHT]);
 
-		InitializeItem(player.HoldItem, IDI_WARRCLUB);
-		GenerateNewSeed(player.HoldItem);
-		AutoPlaceItemInInventory(player, player.HoldItem, true);
+		{
+			Item club;
+			InitializeItem(club, IDI_WARRCLUB);
+			GenerateNewSeed(club);
+			AutoPlaceItemInInventorySlot(player, 0, club, true);
+		}
 
 		InitializeItem(player.SpdList[0], IDI_HEAL);
 		GenerateNewSeed(player.SpdList[0]);