Merge pull request #326 from FAForever/develop

bugfixes for t3 arty
FAForever · Mar 31, 2018 · 89ddbe4 · 89ddbe4
2 parents fe093d0 + f4a3cf9
commit 89ddbe4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/units/INB2302/INB2302_script.lua b/units/INB2302/INB2302_script.lua
@@ -62,10 +62,10 @@ INB2302 = Class(NStructureUnit) {
         gun:SetUnSelectable(true)
         gun:SetFireState(import('/lua/game.lua').FireState.GROUND_FIRE)
         IssueClearCommands( {gun} )
-        IssueMove( {gun}, self:GetPosition() )
 
         -- tell the gun unit we're it's parent
         gun:OnSetParent(self, self.OnArtilleryUnitKilledUnit )
+        IssueMove( {gun}, self:GetPosition() )
 
         ForkThread(function()
                 local stillMoving = true

diff --git a/units/INO2302/INO2302_script.lua b/units/INO2302/INO2302_script.lua
@@ -32,6 +32,7 @@ INO2302 = Class(NOrbitUnit) {
     end,
 
     OnSetParent = function(self, parent, cbKilledUnit)
+        self:SetImmobile(false)
         self.parent = parent
         self.parentCallbacks[ 'OnKilledUnit' ] = cbKilledUnit or false
     end,
@@ -48,9 +49,8 @@ INO2302 = Class(NOrbitUnit) {
         self:EnableWeapon(false)
         self.parentCallbacks[ 'OnWeaponFired' ] = false
         self.parentCallbacks[ 'OnKilledUnit' ] = false
-        if self.xp then
-            self:AddXP(-self.xp)
-        end
+        self:SetUnSelectable(true)
+        IssueClearCommands( {self} )
         -- TODO: maybe some effects stop? lights, I dont know..
     end,