fix: Player.IsSpeaking and TeslaGate.IsPlayerInHurtRange (#341)

* VoiceModule.IsSpeaking is client-side lol use ServerIsSending instead * Fix TeslaGate.IsPlayerInHurtRange --------- Co-authored-by: Yamato <[email protected]>
ExMod-Team · Dec 26, 2024 · ad25390 · ad25390
1 parent b212f0c
commit ad25390
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs
@@ -789,7 +789,7 @@ public bool IsIntercomMuted
         /// <summary>
         /// Gets a value indicating whether the player is speaking.
         /// </summary>
-        public bool IsSpeaking => Role is Roles.IVoiceRole voiceRole && voiceRole.VoiceModule.IsSpeaking;
+        public bool IsSpeaking => Role is Roles.IVoiceRole voiceRole && voiceRole.VoiceModule.ServerIsSending;
 
         /// <summary>
         /// Gets the player's voice color.

diff --git a/EXILED/Exiled.API/Features/TeslaGate.cs b/EXILED/Exiled.API/Features/TeslaGate.cs
@@ -261,7 +261,7 @@ public void ForceTrigger()
         /// </summary>
         /// <param name="player">The <see cref="Player"/> to check.</param>
         /// <returns><see langword="true"/> if the given <see cref="Player"/> is in the hurt range of the tesla gate; otherwise, <see langword="false"/>.</returns>
-        public bool IsPlayerInHurtRange(Player player) => player is not null && Vector3.Distance(Position, player.Position) <= Base.sizeOfTrigger * 2.2f;
+        public bool IsPlayerInHurtRange(Player player) => player is not null && Base.killers.Any(x => new Bounds(x.transform.position, Base.sizeOfKiller).Contains(player.Position));
 
         /// <summary>
         /// Gets a value indicating whether the <see cref="Player"/> is in the idle range of a specific tesla gate.