diff --git a/Plugins/BuildFiles/common.xml b/Plugins/BuildFiles/common.xml
index 4200a7c8a..7cbbd04a4 100644
--- a/Plugins/BuildFiles/common.xml
+++ b/Plugins/BuildFiles/common.xml
@@ -86,7 +86,7 @@
-
+
@@ -158,7 +158,7 @@
-
+
@@ -210,7 +210,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -329,7 +329,7 @@
-
+
diff --git a/Plugins/Mineplex.PlayerCache/.classpath b/Plugins/Mineplex.Cache/.classpath
similarity index 100%
rename from Plugins/Mineplex.PlayerCache/.classpath
rename to Plugins/Mineplex.Cache/.classpath
diff --git a/Plugins/Mineplex.Cache/.project b/Plugins/Mineplex.Cache/.project
new file mode 100644
index 000000000..5321c2157
--- /dev/null
+++ b/Plugins/Mineplex.Cache/.project
@@ -0,0 +1,17 @@
+
+
+ Mineplex.Cache
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/Plugins/Mineplex.PlayerCache/src/mineplex/cache/player/PlayerCache.java b/Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
similarity index 100%
rename from Plugins/Mineplex.PlayerCache/src/mineplex/cache/player/PlayerCache.java
rename to Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
diff --git a/Plugins/Mineplex.PlayerCache/src/mineplex/cache/player/PlayerInfo.java b/Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerInfo.java
similarity index 100%
rename from Plugins/Mineplex.PlayerCache/src/mineplex/cache/player/PlayerInfo.java
rename to Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerInfo.java
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> entry = iterator.next();
- for (Iterator> innerIterator = entry.getValue().entrySet().iterator(); innerIterator.hasNext();)
+ for (Iterator> innerIterator = entry.getValue().entrySet().iterator(); innerIterator
+ .hasNext();)
{
final Entry 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/Mineplex.PlayerCache/Mineplex.PlayerCache.iml b/Plugins/Mineplex.PlayerCache/Mineplex.PlayerCache.iml
deleted file mode 100644
index 54892e832..000000000
--- a/Plugins/Mineplex.PlayerCache/Mineplex.PlayerCache.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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);