From 2bf1012fa41ec41d71e8bea7489786bd6ea21805 Mon Sep 17 00:00:00 2001 From: Teddy Date: Tue, 8 Dec 2015 16:34:07 +0000 Subject: [PATCH 1/2] SSM Pig bomb bug fix --- .../mineplex/core/common/util/UtilPlayer.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java index af1712362..8f4e98a6a 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java @@ -1,5 +1,7 @@ package mineplex.core.common.util; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; @@ -496,6 +498,20 @@ public class UtilPlayer return best; } + private static boolean checkClosest(Player player, Entity... ignore) + { + for(Entity e : ignore) + { + if(e instanceof Player) + { + if(e == player) + return true; + } + } + + return false; + } + public static Player getClosest(Location loc, Entity... ignore) { Player best = null; @@ -509,6 +525,9 @@ public class UtilPlayer if (cur.isDead()) continue; + if(checkClosest(cur, ignore)) + continue; + if (ignore != null) { for (int i = 0; i < ignore.length; i++) From 504a49278cb7e140029e4c2ceb85f3defe524a33 Mon Sep 17 00:00:00 2001 From: Teddy Date: Tue, 8 Dec 2015 16:35:49 +0000 Subject: [PATCH 2/2] SSM kit description change, grammar mistake --- .../src/nautilus/game/arcade/game/games/smash/kits/KitPig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitPig.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitPig.java index 755cfa69d..4ae1fcb33 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitPig.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitPig.java @@ -62,7 +62,7 @@ public class KitPig extends SmashKit ChatColor.RESET + "dealing damage and knockback to enemies.", ChatColor.RESET + "", ChatColor.RESET + "Eat the bacon to restore some Energy.", - ChatColor.RESET + "Bacon that hit an enemy will restore Health.", + ChatColor.RESET + "Bacon that hits an enemy will restore Health.", }));