From b5bdf7ced4341d29116c6efdd91a7bc85b65fd91 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Mon, 14 Dec 2015 15:42:32 +1300
Subject: [PATCH] Remove custom name on players on join and arcade spectator

---
 .../src/mineplex/core/CustomTagFix.java       | 22 ++++++++++++++-----
 .../nautilus/game/arcade/ArcadeManager.java   |  3 +++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
index 790df2c43..d757499b7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
@@ -35,6 +35,8 @@ import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerToggleFlightEvent;
 import org.bukkit.event.player.PlayerVelocityEvent;
@@ -81,6 +83,15 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 		_loggedIn.remove(event.getPlayer());
 	}
 
+	@EventHandler(priority = EventPriority.LOW)
+	public void playerJoin(PlayerJoinEvent event)
+	{
+		Player player = event.getPlayer();
+
+		player.setCustomName("");
+		player.setCustomNameVisible(false);
+	}
+
 	@EventHandler
 	public void ncpExempt(final PlayerToggleFlightEvent event)
 	{
@@ -140,7 +151,8 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 		{
 			Entry<UUID, NautHashMap<CheckType, Long>> entry = iterator.next();
 
-			for (Iterator<Entry<CheckType, Long>> innerIterator = entry.getValue().entrySet().iterator(); innerIterator.hasNext();)
+			for (Iterator<Entry<CheckType, Long>> innerIterator = entry.getValue().entrySet().iterator(); innerIterator
+					.hasNext();)
 			{
 				final Entry<CheckType, Long> entry2 = innerIterator.next();
 
@@ -247,7 +259,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 						_entityNameMap.get(owner.getName()).put(spawnPacket.a, entityName);
 						_entityMap.get(owner.getName()).put(spawnPacket.a, new Integer[]
 							{
-								newId
+									newId
 							});
 
 						sendProtocolPackets(owner, spawnPacket.a, newId, entityName, verifier, true, -1);
@@ -349,7 +361,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 							{
 								newId = new Integer[]
 									{
-										UtilEnt.getNewEntityId()
+											UtilEnt.getNewEntityId()
 									};
 
 								_entityMap.get(owner.getName()).put(metaPacket.a, newId);
@@ -469,8 +481,8 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 
 					_entityRiding.get(owner.getName()).remove(attachPacket.b);
 
-					sendProtocolPackets(owner, vehicleId, ids[ids.length - 1],
-							_entityNameMap.get(owner.getName()).get(vehicleId), verifier, true, ids.length > 1 ? ids[0] : -1);
+					sendProtocolPackets(owner, vehicleId, ids[ids.length - 1], _entityNameMap.get(owner.getName()).get(vehicleId),
+							verifier, true, ids.length > 1 ? ids[0] : -1);
 				}
 				else
 				{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
index fbf22d621..016289a6f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -921,6 +921,9 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 
 		((CraftEntity) player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 0));
 
+		player.setCustomName("");
+		player.setCustomNameVisible(false);
+
 		player.setSprinting(false);
 		player.setSneaking(false);