From 3bab7ffe449af2e61914674862692a0f5338a5c6 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 8 Aug 2016 22:48:13 +0100 Subject: [PATCH] Use attack name for Snowballs and Eggs --- .../game/arcade/game/games/skywars/Skywars.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java index f55830ca8..3da62b6a5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java @@ -984,19 +984,10 @@ public abstract class Skywars extends Game { return; } - - if (this instanceof TeamSkywars && event.GetDamagerPlayer(true) instanceof Player && event.GetDamageeEntity() instanceof Player) - { - if (GetTeam(event.GetDamagerPlayer(true)).equals(GetTeam(event.GetDamageePlayer()))) - { - event.SetCancelled("Team Damage"); - return; - } - } if (event.GetProjectile() instanceof Egg || event.GetProjectile() instanceof Snowball) { - event.AddMod(event.GetDamagerPlayer(true).getName(), (event.GetProjectile() instanceof Egg ? "Egg" : "Snowball"), 2, false); + event.AddMod(event.GetDamagerPlayer(true).getName(), (event.GetProjectile() instanceof Egg ? "Egg" : "Snowball"), 2, true); } }