From 4339042078026206698ed87a45406fff0298b1a5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 25 Dec 2020 10:57:54 -0500
Subject: [PATCH] Fixed #4120

---
 core/src/mindustry/core/Logic.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java
index 5b7349e78e..86c9ec1c97 100644
--- a/core/src/mindustry/core/Logic.java
+++ b/core/src/mindustry/core/Logic.java
@@ -275,16 +275,21 @@ public class Logic implements ApplicationListener{
     public static void sectorCapture(){
         //the sector has been conquered - waves get disabled
         state.rules.waves = false;
-        //disable attack mode
-        state.rules.attackMode = false;
 
-        if(state.rules.sector == null) return;
+        if(state.rules.sector == null){
+            //disable attack mode
+            state.rules.attackMode = false;
+            return;
+        }
 
         state.rules.sector.info.wasCaptured = true;
 
         //fire capture event
         Events.fire(new SectorCaptureEvent(state.rules.sector));
 
+        //disable attack mode
+        state.rules.attackMode = false;
+
         //save, just in case
         if(!headless && !net.client()){
             control.saves.saveSector(state.rules.sector);