Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java

@@ -212,6 +212,11 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 				// Ignore Armor stand packets
 				if (spawnPacket.b == 30 || spawnPacket.l == null || spawnPacket.l.c() == null || spawnPacket.a == 777777)
 				{
+					if (spawnPacket.b == 30)
+					{
+				        _ignoreSkulls.add(spawnPacket.a);
+					}
+
 					return;
 				}
 				

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/TeamBomb.java

@@ -315,8 +315,7 @@ class TeamBomb implements Comparable<TeamBomb>
 
     public void setupHologram()
     {
-        _hologram = new Hologram(this._game.getArcadeManager().getHologramManager(), getBlockLocation().clone().add(0, 1, 0))
-                .setUsesWitherSkull();
+        _hologram = new Hologram(this._game.getArcadeManager().getHologramManager(), getBlockLocation().clone().add(0, 1, 0));
         _hologram.setText(getTeam().GetColor() + C.Bold + getTeam().GetName() + " Team's Bomb");
         _hologram.start();
     }