Merge branch 'Myst_HALLOWEEN'

Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java

@@ -19,6 +19,7 @@ import mineplex.core.mount.types.MountMule;
 import mineplex.core.mount.types.MountSlime;
 import mineplex.core.mount.types.MountSpider;
 import mineplex.core.mount.types.MountUndead;
+import mineplex.core.mount.types.MountZombie;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Horse;
@@ -63,7 +64,7 @@ public class MountManager extends MiniPlugin
 		_types.add(new MountSlime(this));
 		_types.add(new MountCart(this));
 		_types.add(new MountSpider(this));
-		_types.add(new MountUndead(this));
+		_types.add(new MountZombie(this));
 		//_types.add(new MountSheep(this));
 	}
 

Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountUndead.java

@@ -21,19 +21,16 @@ public class MountUndead extends HorseMount
 {
 	public MountUndead(MountManager manager) 
 	{
-		super(manager, "Decrepit Warhorse", new String[]
+		super(manager, "Infernal Horror", new String[]
 				{
-				C.cWhite + "Once a noble steed, it",
+				C.cWhite + "The most ghastly horse in",
-				C.cWhite + "has been beaten down by",
+				C.cWhite + "existance, from the pits of",
-				C.cWhite + "years of faithful service.",
+				C.cWhite + "the Nether.",
-				C.Line,
-				C.cYellow + "Earned by defeating the Pumpkin King",
-				C.cYellow + "in the 2014 Halloween Horror Event.",
 				},
-				Material.ROTTEN_FLESH,
+				Material.BONE,
 				(byte)0,
-				-1,
+				20000,
-				Color.BLACK, Style.NONE, Variant.UNDEAD_HORSE, 0.8, null);
+				Color.BLACK, Style.BLACK_DOTS, Variant.SKELETON_HORSE, 0.8, null);
 	}
 
 	@EventHandler

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlameSlam.java

@@ -1,18 +1,6 @@
 package nautilus.game.arcade.kit.perks;
 
 import java.util.HashMap;
-import java.util.Iterator;
-
-import org.bukkit.GameMode;
-import org.bukkit.Sound;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.util.Vector;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
@@ -22,17 +10,27 @@ import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTime;
-import mineplex.core.common.util.UtilParticle.ParticleType;
-import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import nautilus.game.arcade.kit.Perk;
 
+import org.bukkit.Sound;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.util.Vector;
+
 public class PerkFlameSlam extends Perk
 {
 	private HashMap<Player, Long> _live = new HashMap<Player, Long>();
@@ -93,10 +91,11 @@ public class PerkFlameSlam extends Perk
 			return;
 
 		//Collide
-		Iterator<Player> liveIterator = _live.keySet().iterator();
+		HashMap<Player, Long> copy = new HashMap<Player, Long>();
-		while (liveIterator.hasNext())
+		copy.putAll(_live);
+		
+		for (Player player : copy.keySet())
 		{
-			Player player = liveIterator.next();
 			Vector vel = player.getLocation().getDirection();
 			vel.setY(0);
 			UtilAlg.Normalize(vel);