Merge pull request #621 from misternebula/dev

Dev
qsb-dev · Apr 27, 2023 · 3928d1b · 3928d1b
2 parents 4693330 + 68afde4
commit 3928d1b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs
@@ -39,6 +39,8 @@ public override void OnRemoval()
 			shape.OnShapeActivated -= OnEnable;
 			shape.OnShapeDeactivated -= OnDisable;
 		}
+
+		QSBPlayerManager.OnRemovePlayer -= OnRemovePlayer;
 	}
 
 	public override async UniTask Init(CancellationToken ct)
@@ -75,6 +77,14 @@ public override async UniTask Init(CancellationToken ct)
 			ControllingPlayer = 0u;
 			IsEnabled = false;
 		}
+
+		QSBPlayerManager.OnRemovePlayer += OnRemovePlayer;
+	}
+
+	private void OnRemovePlayer(PlayerInfo player)
+	{
+		_visibleToProbes.Remove(player);
+		AttachedObject._visibleInProbeSnapshot = _visibleToProbes.Any();
 	}
 
 	public override void SendInitialState(uint to) =>
@@ -252,7 +262,7 @@ public void OnTakeProbeSnapshot(PlayerInfo player, ProbeCamera.ID cameraId)
 			_visibleToProbes.Remove(player);
 		}
 
-		AttachedObject._visibleInProbeSnapshot = _visibleToProbes.Any(x => x != null);
+		AttachedObject._visibleInProbeSnapshot = _visibleToProbes.Any();
 	}
 
 	public void OnRemoveProbeSnapshot(PlayerInfo player)
@@ -262,7 +272,7 @@ public void OnRemoveProbeSnapshot(PlayerInfo player)
 			_visibleToProbes.Remove(player);
 		}
 
-		AttachedObject._visibleInProbeSnapshot = _visibleToProbes.Any(x => x != null);
+		AttachedObject._visibleInProbeSnapshot = _visibleToProbes.Any();
 	}
 
 	public List<PlayerInfo> GetVisibleToProbePlayers() => _visibleToProbes;

diff --git a/QSB/ShipSync/ShipManager.cs b/QSB/ShipSync/ShipManager.cs
@@ -73,6 +73,9 @@ private void OnRemovePlayer(PlayerInfo player)
 		{
 			new FlyShipMessage(false).Send();
 		}
+
+		_playersInShip.Remove(player);
+		UpdateElectricalComponent();
 	}
 
 	public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct)