Merge pull request #639 from eesast/dev

fix locking
eesast · May 26, 2023 · ddf0bf4 · ddf0bf4
2 parents da0d579 + 4e8afd1
commit ddf0bf4
Showing 1 changed file with 4 additions and 20 deletions.
diff --git a/logic/Gaming/ActionManager.cs b/logic/Gaming/ActionManager.cs
@@ -106,11 +106,7 @@ public bool Fix(Student player)// 自动检查有无发电机可修
                               gameMap.AddNumOfRepairedGenerators();
                           if (generatorForFix.DegreeOfRepair == GameData.degreeOfFixedGenerator)
                           {
-                              lock (player.ActionLock)
-                              {
-                                  if (stateNum == player.StateNum)
-                                      player.SetPlayerState(RunningStateType.Null);
-                              }
+                              player.ResetPlayerState(stateNum);
                               return false;
                           }
                           return true;
@@ -211,11 +207,7 @@ public bool Treat(Student player, Student? playerTreated = null)
                 long stateNum = player.SetPlayerState(RunningStateType.Waiting, PlayerStateType.Treating);
                 if (stateNum == -1)
                 {
-                    lock (playerTreated.ActionLock)
-                    {
-                        if (playerTreated.StateNum == stateNumTreated)
-                            player.SetPlayerStateNaturally();
-                    }
+                    playerTreated.ResetPlayerState(stateNumTreated);
                     return false;
                 }
 
@@ -227,23 +219,15 @@ public bool Treat(Student player, Student? playerTreated = null)
                    if (!player.StartThread(stateNum, RunningStateType.RunningActively))
                    {
                        player.ThreadNum.Release();
-                       lock (playerTreated.ActionLock)
-                       {
-                           if (playerTreated.StateNum == stateNumTreated)
-                               playerTreated.SetPlayerStateNaturally();
-                       }
+                       playerTreated.ResetPlayerState(stateNumTreated);
                        return;
                    }
 
                    playerTreated.ThreadNum.WaitOne();
                    if (!playerTreated.StartThread(stateNum, RunningStateType.RunningActively))
                    {
                        playerTreated.ThreadNum.Release();
-                       lock (player.ActionLock)
-                       {
-                           if (player.StateNum == stateNum)
-                               player.SetPlayerStateNaturally();
-                       }
+                       player.ResetPlayerState(stateNum);
                        player.ThreadNum.Release();
                        return;
                    }