Server: Ability pings

Zheneq · Jan 22, 2023 · 7bc4829 · 7bc4829
1 parent 7098805
commit 7bc4829
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 3 deletions.
diff --git a/Assembly-CSharp/ActorController.cs b/Assembly-CSharp/ActorController.cs
@@ -191,16 +191,40 @@ internal void CmdSendMinimapPing(int teamIndex, Vector3 worldPosition, PingType
 		if (num == -1)
 		{
 			m_actor.PingOnClient(teamIndex, worldPosition, pingType, true);
-			return;
 		}
-		m_lastPings[num] = Time.time;
-		m_actor.PingOnClient(teamIndex, worldPosition, pingType, false);
+		else
+		{
+			m_lastPings[num] = Time.time;
+			m_actor.PingOnClient(teamIndex, worldPosition, pingType, false);
+		}
 #endif
 	}
 
 	[Command]
+	// was empty in reactor
 	internal void CmdSendAbilityPing(int teamIndex, LocalizationArg_AbilityPing localizedPing)
 	{
+#if SERVER
+		// custom
+		int num = -1;
+		for (int i = 0; i < m_lastPings.Length; i++)
+		{
+			if (m_lastPings[i] + 10f < Time.time)
+			{
+				num = i;
+				break;
+			}
+		}
+		if (num == -1)
+		{
+			m_actor.PingOnClient(teamIndex, localizedPing, true);
+		}
+		else
+		{
+			m_lastPings[num] = Time.time;
+			m_actor.PingOnClient(teamIndex, localizedPing, false);
+		}
+#endif
 	}
 
 	public void ClearHighlights()

diff --git a/Assembly-CSharp/ActorData.cs b/Assembly-CSharp/ActorData.cs
@@ -6489,6 +6489,17 @@ public void PingOnClient(int teamIndex, Vector3 worldPosition, ActorController.P
 	}
 #endif
 
+#if SERVER
+	// custom
+	public void PingOnClient(int teamIndex, LocalizationArg_AbilityPing localizedPing, bool spam)
+	{
+		if (m_teamSensitiveData_friendly != null)
+		{
+			m_teamSensitiveData_friendly.CallRpcReceivedAbilityPingInfo(teamIndex, localizedPing, spam);
+		}
+	}
+#endif
+
 	public void SendPingRequestToServer(int teamIndex, Vector3 worldPosition, ActorController.PingType pingType)
 	{
 		if (GetActorController() != null)