Merge branch 'master' into update-xmaschaos

Plugins/BuildFiles/common.xml

@@ -86,7 +86,7 @@
 			<fileset dir="../Mineplex.ServerData/bin">
 				<include name="**/*.class"/>
 			</fileset>
-			<fileset dir="../Mineplex.PlayerCache/bin">
+			<fileset dir="../Mineplex.Cache/bin">
 				<include name="**/*.class"/>
 			</fileset>
 			
@@ -158,7 +158,7 @@
 			<fileset dir="../Mineplex.Database/bin">
 				<include name="**/*.class"/>
 			</fileset>
-			<fileset dir="../Mineplex.PlayerCache/bin">
+			<fileset dir="../Mineplex.Cache/bin">
 				<include name="**/*.class"/>
 			</fileset>
 			<fileset dir="../Mineplex.ServerData/bin">
@@ -210,7 +210,7 @@
 			<fileset dir="../Mineplex.ServerData/bin">
 				<include name="**/*.class"/>
 			</fileset>
-			<fileset dir="../Mineplex.PlayerCache/bin">
+			<fileset dir="../Mineplex.Cache/bin">
 				<include name="**/*.class"/>
 			</fileset>
 			
@@ -249,7 +249,7 @@
 			<fileset dir="../Mineplex.ServerData/bin">
 				<include name="**/*.class"/>
 			</fileset>
-			<fileset dir="../Mineplex.PlayerCache/bin">
+			<fileset dir="../Mineplex.Cache/bin">
 				<include name="**/*.class"/>
 			</fileset>
 			
@@ -329,7 +329,7 @@
 				<include name="**/*.class"/>
 			</fileset>
 			
-			<fileset dir="../Mineplex.PlayerCache/bin">
+			<fileset dir="../Mineplex.Cache/bin">
 				<include name="**/*.class"/>
 			</fileset>
 			

Plugins/Mineplex.Cache/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Mineplex.Cache</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

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],
+					sendProtocolPackets(owner, vehicleId, ids[ids.length - 1], _entityNameMap.get(owner.getName()).get(vehicleId),
-							_entityNameMap.get(owner.getName()).get(vehicleId), verifier, true, ids.length > 1 ? ids[0] : -1);
+							verifier, true, ids.length > 1 ? ids[0] : -1);
 				}
 				else
 				{

Plugins/Mineplex.PlayerCache/Mineplex.PlayerCache.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Mineplex.ServerData" />
-  </component>
-</module>

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);