Fixes self-hit when spamclicking (#6864)

* Moves hiticons out from player prefabs into SpriteManager. Hit icons will now be pooled in the SpriteHandlerManager. Fixes the hiticons being target of interactions, which was making players hit themselves when spamclicking a target. * Adds the HitIcon prefab to the NetworkManager. Moves the HitIcon spawn away from the SpriteHandlerManager, it'll now use the Spawn and Despawn classes utilizing their client only functions.
unitystation · Jun 28, 2021 · 1f5d871 · 1f5d871
1 parent 20a7d67
commit 1f5d871
Show file tree

Hide file tree

Showing 8 changed files with 133 additions and 137 deletions.
diff --git a/UnityProject/Assets/Prefabs/Player/Resources/Player_V4(uNet).prefab b/UnityProject/Assets/Prefabs/Player/Resources/Player_V4(uNet).prefab
diff --git a/UnityProject/Assets/Prefabs/Player/Resources/hitIcon.prefab b/UnityProject/Assets/Prefabs/Player/Resources/hitIcon.prefab
diff --git a/UnityProject/Assets/Prefabs/Player/Resources/hitIcon.prefab.meta b/UnityProject/Assets/Prefabs/Player/Resources/hitIcon.prefab.meta
diff --git a/UnityProject/Assets/Prefabs/SceneConstruction/NestedManagers/NetworkManager.prefab b/UnityProject/Assets/Prefabs/SceneConstruction/NestedManagers/NetworkManager.prefab
diff --git a/UnityProject/Assets/Prefabs/SceneConstruction/NestedManagers/SpriteManager.prefab b/UnityProject/Assets/Prefabs/SceneConstruction/NestedManagers/SpriteManager.prefab
diff --git a/UnityProject/Assets/Scripts/Items/Weapons/WeaponNetworkActions.cs b/UnityProject/Assets/Scripts/Items/Weapons/WeaponNetworkActions.cs
@@ -205,7 +205,9 @@ public void RpcMeleeAttackLerp(Vector2 stabDir, GameObject weapon)
 
 		if (spriteRendererSource != null)
 		{
-			playerScript.hitIcon.ShowHitIcon(stabDir, spriteRendererSource);
+			var projectile = Spawn.ClientPrefab("hitIcon", playerScript.transform.position, playerScript.transform.parent).GameObject;
+			var hitIcon = projectile.GetComponent<HitIcon>();
+			hitIcon.ShowHitIcon(stabDir, spriteRendererSource, playerScript);
 		}
 
 		Vector3 lerpFromWorld = spritesObj.transform.position;