Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex

Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java

@@ -402,6 +402,11 @@ public class DisguiseManager extends MiniPlugin implements IPacketRunnable
 					}
 				});
 			}
+			
+			if (_spawnPacketMap.get(movePacket.a) instanceof DisguiseBlock)
+			{
+				
+			}
 		}
 		else if (packet instanceof Packet33RelEntityMoveLook)
 		{

Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseBase.java

@@ -13,6 +13,8 @@ public abstract class DisguiseBase
 	protected Entity Entity;
 	protected DataWatcher DataWatcher;
 	
+	private DisguiseBase _soundDisguise;
+	
 	public DisguiseBase(org.bukkit.entity.Entity entity)
 	{
 		Entity = ((CraftEntity)entity).getHandle();
@@ -20,6 +22,8 @@ public abstract class DisguiseBase
 		
 		DataWatcher.a(0, Byte.valueOf((byte)0));
 		DataWatcher.a(1, Short.valueOf((short)300));
+		
+		_soundDisguise = this;
 	}
 	
 	public void UpdateDataWatcher()
@@ -40,15 +44,23 @@ public abstract class DisguiseBase
 		UpdateDataWatcher();
 		return new Packet40EntityMetadata(Entity.id, DataWatcher, true);
 	}
+
+	public void setSoundDisguise(DisguiseBase soundDisguise)
+	{
+		_soundDisguise = soundDisguise;
+		
+		if (_soundDisguise == null)
+			_soundDisguise = this;
+	}
 	
 	public void playHurtSound()
 	{
-		Entity.world.makeSound(Entity, getHurtSound(), getVolume(), getPitch());
+		Entity.world.makeSound(Entity, _soundDisguise.getHurtSound(), _soundDisguise.getVolume(), _soundDisguise.getPitch());
 	}
 	
 	public void playHurtSound(Location location)
 	{
-		Entity.world.makeSound(location.getX(), location.getY(), location.getZ(), getHurtSound(), getVolume(), getPitch());
+		Entity.world.makeSound(location.getX(), location.getY(), location.getZ(), _soundDisguise.getHurtSound(), _soundDisguise.getVolume(), _soundDisguise.getPitch());
 	}
 	
 	public void UpdateEntity(Entity entity)

Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java

@@ -23,7 +23,7 @@ public class ServerMonitor
 			{
 				for (ServerStatusData statusData : _repository.retrieveOldServerStatuses())
 				{
-					System.out.println("----Old Server Status----");
+					System.out.println("----Old Server Status----> " + statusData.Address + ", " + statusData.Name);
 					killServer(statusData);
 				}
 				
@@ -133,7 +133,7 @@ public class ServerMonitor
             } 
 	    }
 	    catch (Exception e) 
-	    {
+	    {   
 	    	e.printStackTrace();
 	    }
 	    finally