Merge pull request #387 from OoliteProject/weapon_scripting_context

Fix for correct context when adding weapons to player ship
OoliteProject · Aug 4, 2021 · 84006e2 · 84006e2
2 parents 31939ba + c8bddc2
commit 84006e2
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Core/Scripting/OOJSShip.m b/src/Core/Scripting/OOJSShip.m
@@ -1864,7 +1864,15 @@ static JSBool ShipSetProperty(JSContext *context, JSObject *this, jsid propID, J
 					facing = [entity currentWeaponFacing];
 					break;
 			}
-			[entity setWeaponMount:facing toWeapon:sValue];
+			if ([entity isPlayer])
+			{
+				PlayerEntity *pent = (PlayerEntity*)entity;
+				[pent setWeaponMount:facing toWeapon:sValue inContext:@"scripted"];
+			}
+			else 
+			{
+				[entity setWeaponMount:facing toWeapon:sValue];
+			}
 			return YES;
 
 		case kShip_maxEscorts: