diff --git a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs index 6098d6a..c6e7556 100644 --- a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs @@ -174,10 +174,14 @@ public class NoPlayablePlayer : Player if (currentField.placedItem != null) { Trap t = currentField.placedItem.GetComponent(); - AddCoins(-3); - t.target.AddCoins(3); - currentField.placedItem = null; - Destroy(t.gameObject); + + if(t.target.index != index) + { + AddCoins(-3); + t.target.AddCoins(3); + currentField.placedItem = null; + Destroy(t.gameObject); + } } } diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs index 207d468..0b01659 100644 --- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs @@ -177,11 +177,15 @@ public class PlayablePlayer : Player if (currentField.placedItem != null) { Trap t = currentField.placedItem.GetComponent(); - AddCoins(-3); - Debug.Log(t.name); - t.target.AddCoins(3); - currentField.placedItem = null; - Destroy(t.gameObject); + + if(t.target.index != index) + { + AddCoins(-3); + Debug.Log(t.name); + t.target.AddCoins(3); + currentField.placedItem = null; + Destroy(t.gameObject); + } } } Vector3 currentRotation = Quaternion.ToEulerAngles(transform.rotation); diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs index bca0eb8..d098572 100644 --- a/FlufflParty/Assets/Scripts/Players/Player.cs +++ b/FlufflParty/Assets/Scripts/Players/Player.cs @@ -16,6 +16,7 @@ public abstract class Player : MonoBehaviour protected Field currentField; protected Vector3 cameraOffset = new Vector3(-2.81f, 8.13f, 5.6f); + //players ID public int index; public int coins = 0; public int stars = 0;