Show/Remove ImportantTaskText in freeplay

Hardel-DW · Jun 28, 2021 · b4c7610 · b4c7610
1 parent b9b7d6d
commit b4c7610
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Harion/CustomRoles/FreeplayTaskTester/FileRole.cs b/Harion/CustomRoles/FreeplayTaskTester/FileRole.cs
@@ -67,12 +67,12 @@ private static void Start(TaskAddButton taskFolder, RoleManager role) {
         private static void OnClick(TaskAddButton taskFolder, RoleManager role) {
             GameData.PlayerInfo data = PlayerControl.LocalPlayer.Data;
             if (role.HasRole(data.Object)) {
+                role.RpcRemovePlayer(data.Object);
+                taskFolder.Overlay.enabled = false;
+
                 if (data.IsImpostor) {
                     PlayerControl.LocalPlayer.RemoveInfected();
                 }
-
-                role.RpcRemovePlayer(data.Object);
-                taskFolder.Overlay.enabled = false;
             } else {
                 if (RoleManager.HasMainRole(data.Object)) {
                     RoleManager Role = RoleManager.GetMainRole(data.Object);

diff --git a/Harion/CustomRoles/RoleManager.cs b/Harion/CustomRoles/RoleManager.cs
@@ -135,8 +135,10 @@ private void AddPlayer(byte PlayerId) {
             if (Player != null) {
                 RoleManager MainRole = GetMainRole(Player);
 
-                if (MainRole == null || !IsMainRole)
+                if (MainRole == null || !IsMainRole) {
                     AllPlayers.Add(Player);
+                    AddImportantTasks(Player);
+                }
             }
 
             DefineVisibleByWhitelist();
@@ -185,6 +187,9 @@ public void RpcAddPlayerRange(List<byte> PlayerIds) {
 
         // Remove method
         private void RemovePlayer(byte PlayerId) {
+            if (PlayerId == PlayerControl.LocalPlayer.PlayerId)
+                RemoveImportantTasks(PlayerControl.LocalPlayer);
+
             AllPlayers.RemovePlayer(PlayerId);
             DefineVisibleByWhitelist();
         }