From da9eefa00e24c5e18e740efe0c5586487492278b Mon Sep 17 00:00:00 2001
From: Jason Durand 01 <jason.durand.1@ens.etsmtl.ca>
Date: Sun, 3 Apr 2022 16:02:01 -0400
Subject: [PATCH] Cleared off nullable warnings

---
 Assets/Scripts/Entity.cs          |  6 +++---
 Assets/Scripts/GameFlowManager.cs |  7 ++++---
 Assets/Scripts/MinionThrower.cs   | 11 ++++++-----
 Assets/Scripts/PlayerMovement.cs  |  6 +++---
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Assets/Scripts/Entity.cs b/Assets/Scripts/Entity.cs
index f0c2422..c4cf519 100644
--- a/Assets/Scripts/Entity.cs
+++ b/Assets/Scripts/Entity.cs
@@ -36,9 +36,9 @@ public class Entity : MonoBehaviour {
     public Transform target;
     public EntityFlag entityType { get; protected set; }
     public Vector3 direction { get; set; }
-    public Rigidbody2D rb { get; private set; }
-    public Collider2D collider { get; private set; }
-    [field: SerializeField]public SpriteRenderer renderer { get; private set; }
+    public Rigidbody2D rb { get; private set; } = null!;
+    public new Collider2D collider { get; private set; } = null!;
+    [field: SerializeField]public new SpriteRenderer renderer { get; private set; }
     [SerializeField] GameObject halo;
     [SerializeField] protected Color deadColor = Color.red;
     [SerializeField] protected Color emptyColor = Color.grey;
diff --git a/Assets/Scripts/GameFlowManager.cs b/Assets/Scripts/GameFlowManager.cs
index db2c555..1b60188 100644
--- a/Assets/Scripts/GameFlowManager.cs
+++ b/Assets/Scripts/GameFlowManager.cs
@@ -37,10 +37,11 @@ public class GameFlowManager : MonoBehaviour {
 	float fadeStep = 0.02f;
 	float fadingTimer;
 	bool fadingIn = false;
-	[field: SerializeField] TMP_Text startTxt;
-	[field: SerializeField] TMP_Text endTxt;
+	
+	[field: SerializeField] TMP_Text startTxt = null!;
+	[field: SerializeField] TMP_Text endTxt = null!;
 
-	public event Action<BaseState> stateChanged;
+	public event Action<BaseState>? stateChanged;
 
 	#region Unity Messages
 
diff --git a/Assets/Scripts/MinionThrower.cs b/Assets/Scripts/MinionThrower.cs
index d79f265..8c14989 100644
--- a/Assets/Scripts/MinionThrower.cs
+++ b/Assets/Scripts/MinionThrower.cs
@@ -11,14 +11,15 @@ public class MinionThrower : MonoBehaviour {
 	[SerializeField] [Required]
 	PlayerStats playerStats = null!;
 
-    public Entity[] minionPrefabs;
-    public GameObject aimArrow;
+    public Entity[] minionPrefabs = null!;
+    public GameObject aimArrow = null!;
 
     bool isInThrowMode;
     Vector2 throwDirection;
-    MinionBar minionBar;
-    VampireEntity vampireEntity;
-    PlayerMovement movement;
+    MinionBar minionBar = null!;
+    VampireEntity vampireEntity = null!;
+    PlayerMovement movement = null!;
+    
     float currentCooldownTimer;
     float currentInitialCooldown;
 
diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs
index 6925826..09d9b21 100644
--- a/Assets/Scripts/PlayerMovement.cs
+++ b/Assets/Scripts/PlayerMovement.cs
@@ -10,7 +10,7 @@ public class PlayerMovement : MonoBehaviour {
 
 	[SerializeField] [field: Required]
 	PlayerStats stats = null!;
-	[SerializeField] GameObject globalCamera;
+	[SerializeField] GameObject globalCamera = null!;
 
 	[field: Required]
 	Rigidbody2D rb = null!;
@@ -18,8 +18,8 @@ public class PlayerMovement : MonoBehaviour {
 	Vector2 moveDirection;
 	BaseState currentState = null!;
 	SafeZone? safeZone;
-	VampireEntity vampireEntity;
-	Animator animator;
+	VampireEntity vampireEntity = null!;
+	Animator animator = null!;
 	public bool facingRight { get; private set; } = true;
 
 	bool lastJumpButton;