From 5f1e2d2cb58467941d2d63af2b197ff1cbc43a2c Mon Sep 17 00:00:00 2001
From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com>
Date: Sun, 14 Nov 2021 16:13:27 +0200
Subject: [PATCH] [Micro] Phase fix

---
 source/assets/scripts/pre_processors/uin_pre_processor.gd | 3 +--
 source/assets/scripts/server_handlers/global.gd           | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/source/assets/scripts/pre_processors/uin_pre_processor.gd b/source/assets/scripts/pre_processors/uin_pre_processor.gd
index 6b71eee..6f2db51 100644
--- a/source/assets/scripts/pre_processors/uin_pre_processor.gd
+++ b/source/assets/scripts/pre_processors/uin_pre_processor.gd
@@ -30,7 +30,7 @@ func update(clientPhase):
 		"r_dec": Input.is_action_pressed("rotation_decrease"),
 		"shoot": Input.is_action_pressed("input_shoot")
 	}
-	if clientPhase != null and clientPhase["active"] != null and clientPhase != "ignore":
+	if clientPhase != null and clientPhase["active"] != null:
 		if clientPhase["active"]["phase_id"] == 0:
 			inputState["r_inc"] = false
 			inputState["r_dec"] = false
@@ -61,5 +61,4 @@ func update(clientPhase):
 				"r_dec": false,
 				"shoot": false
 			}
-	elif clientPhase == "ignore": pass
 	return inputState
diff --git a/source/assets/scripts/server_handlers/global.gd b/source/assets/scripts/server_handlers/global.gd
index 7c97847..f5ba27e 100644
--- a/source/assets/scripts/server_handlers/global.gd
+++ b/source/assets/scripts/server_handlers/global.gd
@@ -48,7 +48,7 @@ func phase_update_global():
 		if activePhaseTracker != null:
 			if clientPhase[str(activePhaseTracker)]["start_time"] != null:
 				if currentTime["second"] + currentTime["minute"] * 60 - clientPhase[str(activePhaseTracker)]["start_time"]["second"] - clientPhase[str(activePhaseTracker)]["start_time"]["minute"] * 60 > clientPhase[str(activePhaseTracker)]["length"]:
-					if activePhaseTracker == clientPhase.size() - 2:
+					if activePhaseTracker == clientPhase.size() - 3:
 						clientPhase[str(activePhaseTracker)]["start_time"] = null 
 						activePhaseTracker = 0
 					else: 
@@ -57,12 +57,14 @@ func phase_update_global():
 			else: clientPhase[str(activePhaseTracker)]["start_time"] = currentTime
 		else: activePhaseTracker = 0
 		clientPhase["active"] = clientPhase[str(activePhaseTracker)]
+	else:
+		clientPhase["active"] = null
+		activePhaseTracker = null
 	pass
 
 
 func start_game(value):
 	gameStart = value
-	clientPhase["active"] = "ignore"
 	pass