From ab9fe57f427e2691fb16b203163c03e756f54be7 Mon Sep 17 00:00:00 2001
From: Pelayori <31128562+Pelayori@users.noreply.github.com>
Date: Sat, 14 Jan 2023 12:58:25 +0100
Subject: [PATCH] Fixed incorrect min/max level for arkshop

---
 ArkHomes/ArkHomes/ArkHomes.vcxproj | 2 +-
 ArkShop/ArkShop/Private/Store.cpp  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ArkHomes/ArkHomes/ArkHomes.vcxproj b/ArkHomes/ArkHomes/ArkHomes.vcxproj
index 7440d8f0..bb3bdfef 100644
--- a/ArkHomes/ArkHomes/ArkHomes.vcxproj
+++ b/ArkHomes/ArkHomes/ArkHomes.vcxproj
@@ -17,7 +17,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/ArkShop/ArkShop/Private/Store.cpp b/ArkShop/ArkShop/Private/Store.cpp
index b7f00258..2ed840e5 100644
--- a/ArkShop/ArkShop/Private/Store.cpp
+++ b/ArkShop/ArkShop/Private/Store.cpp
@@ -377,10 +377,12 @@ namespace ArkShop::Store
 			const int min_level = item_entry.value("MinLevel", 1);
 			const int max_level = item_entry.value("MaxLevel", 999);
 
-			auto* primal_character = static_cast<APrimalCharacter*>(player_controller->CharacterField());
+			auto* primal_character = player_controller->LastControlledPlayerCharacterField().Get();
+			if (!primal_character)
+				return false;
 			UPrimalCharacterStatusComponent* char_component = primal_character->MyCharacterStatusComponentField();
 
-			const int level = char_component->BaseCharacterLevelField() + char_component->ExtraCharacterLevelField();
+			const int level = char_component->GetCharacterLevel();
 			if (level < min_level || level > max_level)
 			{
 				ArkApi::GetApiUtils().SendChatMessage(player_controller, GetText("Sender"),