diff --git a/D1.uproject b/D1.uproject
index f3e2dc39..da7abcd1 100644
--- a/D1.uproject
+++ b/D1.uproject
@@ -20,6 +20,14 @@
 			"TargetAllowList": [
 				"Editor"
 			]
+		},
+		{
+			"Name": "VisualStudioTools",
+			"Enabled": true,
+			"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/362651520df94e4fa65492dbcba44ae2",
+			"SupportedTargetPlatforms": [
+				"Win64"
+			]
 		}
 	]
 }
\ No newline at end of file
diff --git a/Source/D1/Actor/BaseEquippable.cpp b/Source/D1/Actor/BaseEquippable.cpp
index 38e1e770..d1819e7a 100644
--- a/Source/D1/Actor/BaseEquippable.cpp
+++ b/Source/D1/Actor/BaseEquippable.cpp
@@ -33,7 +33,7 @@ void ABaseEquippable::AttachActor(const FName SocketName)
 
 void ABaseEquippable::OnEquipped()
 {
-	bIsEquipped = true;
+	SetIsEquipped(true);
 	AttachToActor(this, FAttachmentTransformRules::SnapToTargetNotIncludingScale, AttachSocketName);
 }
 
diff --git a/Source/D1/CombatCharacter.cpp b/Source/D1/CombatCharacter.cpp
index 1f4089b2..a02762f5 100644
--- a/Source/D1/CombatCharacter.cpp
+++ b/Source/D1/CombatCharacter.cpp
@@ -169,10 +169,10 @@ void ACombatCharacter::ToggleCombat(const FInputActionValue& Value)
 	bool bInput = Value.Get<bool>();
 
 	ABaseWeapon* baseWeapon = CombatComponent->GetMainWeapon();
-	bool isCombatEnabled = CombatComponent->GetCombatEnabled();
 	if (!baseWeapon)
 		return;
 	
+	bool isCombatEnabled = CombatComponent->GetCombatEnabled();
 	if (!isCombatEnabled)
 		PlayAnimMontage(baseWeapon->GetEnterCombat());
 	else