Merge remote-tracking branch 'refs/remotes/origin/master' into FlightControl

# Conflicts:
#	Moose Mission Setup/Moose.lua
This commit is contained in:
FlightControl 2017-01-07 16:46:50 +01:00
commit 243f33764a

View File

@ -502,6 +502,10 @@ function MISSILETRAINER:_EventShot( Event )
else
-- TODO: some weapons don't know the target unit... Need to develop a workaround for this.
SCHEDULER:New( TrainerWeapon, TrainerWeapon.destroy, {}, 2 )
if ( TrainerWeapon:getTypeName() == "9M311" ) then
SCHEDULER:New( TrainerWeapon, TrainerWeapon.destroy, {}, 2 )
else
end
end
end