Re-ordering ship hit handling to destroy instead of calling client

where needed
beanieboi · May 11, 2016 · 28af8c5 · 28af8c5
1 parent e00c013
commit 28af8c5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/models/ship.rb b/app/models/ship.rb
@@ -39,11 +39,12 @@ def fire!(other_ship)
   def hit!(other_ship)
     self.update_attributes(shield: shield - FIRE_DAMAGE)
     events.create!(event_name: "hit")
-    ship_client.hit(other_ship)
 
     if shield <= 0
       events.create!(event_name: "destroyed")
       swarm_client.destroy_ship(self)
+    else
+      ship_client.hit(other_ship)
     end
   end