Manual diff merge from FF/Development

Hopefully cleans up the mess now.

Moose Development/Moose/Functional/ZoneCaptureCoalition.lua

@@ -545,6 +545,10 @@ do -- ZONE_CAPTURE_COALITION
     -- @param #ZONE_CAPTURE_COALITION self
     -- @param #number Delay
 
+    -- We check if a unit within the zone is hit.
+    -- If it is, then we must move the zone to attack state.
+    self:HandleEvent( EVENTS.Hit, self.OnEventHit )
+
     return self
   end
   
@@ -789,5 +793,20 @@ do -- ZONE_CAPTURE_COALITION
     end
   end
   
+  --- @param #ZONE_CAPTURE_COALITION self
+  -- @param Core.Event#EVENTDATA EventData The event data.
+  function ZONE_CAPTURE_COALITION:OnEventHit( EventData )
+  
+    local UnitHit = EventData.TgtUnit
+    
+    if UnitHit then
+      if UnitHit:IsInZone( self.Zone ) then
+        self:Attack()
+      end
+    end
+  
+  end
+  
+  
 end