JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include teammates in Mass Electrocution counter (PC-1647)

Browse Source
This commit is contained in:
ArcticZeroo 2017-10-21 23:52:30 -04:00 committed by Alexander Meech
parent 7e4d6c4320
commit 924e0b6fda
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ElectrocutionStatTracker.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import mineplex.minecraft.game.classcombat.Skill.Mage.LightningOrb.LightningOrbEvent; import mineplex.minecraft.game.classcombat.Skill.Mage.LightningOrb.LightningOrbEvent;
import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.GameTeam;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -25,12 +26,22 @@ public class ElectrocutionStatTracker extends StatTracker<Game>
return; return;
List<Player> viable = new ArrayList<Player>(); List<Player> viable = new ArrayList<Player>();
GameTeam playerTeam = getGame().GetTeam(event.getPlayer());
for (LivingEntity en : event.getStruck()) for (LivingEntity en : event.getStruck())
{ {
if (en instanceof Player) if (en instanceof Player)
{ {
viable.add((Player) en); Player struckPlayer = (Player) en;
GameTeam struckTeam = getGame().GetTeam(struckPlayer);
if (struckTeam != null && playerTeam != null && struckTeam != playerTeam) {
continue;
}
viable.add(struckPlayer);
} }
} }