temporary fix for #275 which rolls back the fix for #237 which needs …

…another solution
Southclaws · Jul 16, 2016 · a7ad1cd · Southclaws · Jul 17, 2016 · a7ad1cd
1 parent 85646fe
commit a7ad1cd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/BUILD_NUMBER b/BUILD_NUMBER
@@ -1 +1 @@
-1139
+1142
diff --git a/gamemodes/sss/core/player/core.pwn b/gamemodes/sss/core/player/core.pwn
@@ -397,6 +397,9 @@ public OnPlayerUpdate(playerid)
 	if(ply_Data[playerid][ply_BitFlags] & Frozen)
 		return 0;
 
+	if(IsPlayerDataLoaded(playerid))
+		return 0;
+
 	if(IsPlayerInAnyVehicle(playerid))
 	{
 		static

diff --git a/gamemodes/sss/core/player/save-load.pwn b/gamemodes/sss/core/player/save-load.pwn
@@ -421,13 +421,14 @@ LoadPlayerChar(playerid)
 	Held item
 */
 
+	data[0] = -1;
+
 	length = modio_read(filename, _T<H,E,L,D>, sizeof(data), data);
 
 	if(IsValidItemType(ItemType:data[0]) && length > 0)
 	{
-		itemid = AllocNextItemID(ItemType:data[0]);
+		itemid = CreateItem(ItemType:data[0]);
 		SetItemArrayData(itemid, data[2], data[1]);
-		CreateItem_ExplicitID(itemid);
 		GiveWorldItemToPlayer(playerid, itemid);
 
 		d:2:HANDLER("[LOAD:%p] HELD %d (%d adc) (itemid: %d)", playerid, data[0], data[1], itemid);