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

Plugins/Core/src/me/chiss/Core/Modules/Tester.java

@@ -141,11 +141,6 @@ public class Tester extends AModule
 			ShowPlayersInKarts();
 		}
 		
-		if (cmd.equals("blocks"))
-		{
-			ShowBlocks(caller);
-		}
-		
 		if (cmd.equals("testi"))
 		{
 			ShowBobInvis(caller);
@@ -229,68 +224,6 @@ public class Tester extends AModule
 		}, 20L);
 	}
 	
-	public void ShowBlocks(Player player)
-	{
-		EntityPlayer mcPlayer = ((CraftPlayer)player).getHandle();
-		/*
-		final FakePlayer fakePlayer = new FakePlayer("BOB", player.getEyeLocation().add(1, 0, 0));
-		final FakePlayer fakePlayer2 = new FakePlayer("BOB2", player.getEyeLocation().add(0, 0, 1));
-		final FakePlayer fakePlayer3 = new FakePlayer("BOB3", player.getEyeLocation().add(-1, 0, 0));
-		
-		final FakeEntity fakePlayer = new FakeEntity(EntityType.GHAST, player.getLocation().add(1, -3, 0));
-		final FakeEntity fakePlayer2 = new FakeEntity(EntityType.GHAST, player.getLocation().add(0, -3, 1));
-		final FakeEntity fakePlayer3 = new FakeEntity(EntityType.GHAST, player.getLocation().add(-1, -3, 0));
-		*/
-		// Falling blocks
-		/*
-		FakeEntity entity = new FakeFallingBlock(Material.LAVA.getId(), (byte)0, player.getLocation().add(1, 0, 0));
-		FakeEntity entity2 = new FakeFallingBlock(Material.LAVA.getId(), (byte)0, player.getLocation().add(1, 0, 0));
-		FakeEntity entity3 = new FakeFallingBlock(Material.LAVA.getId(), (byte)0, player.getLocation().add(1, 0, 0));
-		*/
-		
-		final FakeEntity entity = new FakeEntity(EntityType.SLIME, player.getLocation().add(1.5, 0, 0));
-		final FakeEntity entity2 = new FakeEntity(EntityType.SLIME, player.getLocation().add(0, 0, 1.5));
-		final FakeEntity entity3 = new FakeEntity(EntityType.SLIME, player.getLocation().add(-1.5, 0, 0));
-		
-		//FakeEntityManager.Instance.AddFakeEntity(fakePlayer, player.getName());
-		FakeEntityManager.Instance.AddFakeEntity(entity, player.getName());
-		//FakeEntityManager.Instance.AddFakeEntity(fakePlayer2, player.getName());
-		FakeEntityManager.Instance.AddFakeEntity(entity2, player.getName());
-		//FakeEntityManager.Instance.AddFakeEntity(fakePlayer3, player.getName());
-		FakeEntityManager.Instance.AddFakeEntity(entity3, player.getName());
-		
-		//mcPlayer.playerConnection.sendPacket(fakePlayer.Spawn());
-		mcPlayer.playerConnection.sendPacket(entity.Spawn());
-		//mcPlayer.playerConnection.sendPacket(fakePlayer.SetPassenger(entity.GetEntityId()));
-		//mcPlayer.playerConnection.sendPacket(fakePlayer.Hide());
-		
-		//mcPlayer.playerConnection.sendPacket(fakePlayer2.Spawn());
-		mcPlayer.playerConnection.sendPacket(entity2.Spawn());
-		//mcPlayer.playerConnection.sendPacket(fakePlayer2.SetPassenger(entity2.GetEntityId()));
-		//mcPlayer.playerConnection.sendPacket(fakePlayer2.Hide());
-		
-		//mcPlayer.playerConnection.sendPacket(fakePlayer3.Spawn());
-		mcPlayer.playerConnection.sendPacket(entity3.Spawn());
-		//mcPlayer.playerConnection.sendPacket(fakePlayer3.SetPassenger(entity3.GetEntityId()));
-		//mcPlayer.playerConnection.sendPacket(fakePlayer3.Hide());
-
-		/*
-		for (int i=0; i < 21; i++)
-		{
-			Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugins()[0], new Runnable()
-			{
-				public void run()
-				{
-					mcPlayer.playerConnection.sendPacket(new Packet28EntityVelocity(fakePlayer.GetEntityId(), .1, 0, 0));
-					mcPlayer.playerConnection.sendPacket(new Packet31RelEntityMove(fakePlayer.GetEntityId(), (byte)(1), (byte)0, (byte)0));
-				}
-			}, i);
-		}
-		*/
-		
-		new UpdateThread(mcPlayer, entity, entity2, entity3).start();
-	}
-	
 	public void ShowFakePig(Player player)
 	{
 		FakeEntity entity = new FakeEntity(EntityType.PIG, player.getLocation());

Plugins/Mineplex.Core.Common/.classpath

@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
-	<classpathentry kind="lib" path="Z:/Mineplex/master/Plugins/Libraries/craftbukkit.jar"/>
+	<classpathentry kind="var" path="REPO_DIR/Plugins/bin/craftbukkit.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Plugins/Mineplex.Core/.classpath

@@ -4,9 +4,9 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/httpcore-4.2.jar"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/httpclient-4.2.jar"/>
-	<classpathentry kind="var" path="REPO_DIR/Plugins/bin/craftbukkit.jar"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-codec-1.6.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core.Common"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core.CraftBukkit"/>
+	<classpathentry kind="var" path="REPO_DIR/Plugins/bin/craftbukkit.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Plugins/Mineplex.Core/.project

@@ -16,11 +16,7 @@
 			<arguments>
 				<dictionary>
 					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/Core Builder.launch</value>
+					<value>&lt;project&gt;/.externalToolBuilders/Core.launch</value>
-				</dictionary>
-				<dictionary>
-					<key>incclean</key>
-					<value>true</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>

Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java

@@ -31,8 +31,6 @@ public class NewsManager extends MiniPlugin
 		
 		_news = new String[] 
 				{
-				C.cYellow + C.Bold + "SG Tournament: " + C.cAqua + C.Bold + "Most Kills Over Weekend" + ChatColor.RESET + "!",
-				C.cYellow + C.Bold + "Tournament Prize: " + C.cAqua + C.Bold + "Minecon 2013 Cape" + ChatColor.RESET + "!",
 				"Europe Servers: " + C.cGreen + C.Bold + "Will be back ASAP" + ChatColor.RESET + "!",
 				"New Game: " + C.cGold + C.Bold + "Draw My Thing" + ChatColor.RESET + "!",
 				};

Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java

@@ -609,7 +609,7 @@ public class ServerManager extends MiniPlugin
 	
 	public ServerNpcShop getSurvivalGamesShop()
 	{
-		return _serverNpcShopMap.get("Survival Games Beta");
+		return _serverNpcShopMap.get("Survival Games");
 	}
 
 	public ServerNpcShop getBlockHuntShop()

Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/EntityInsentient.java

@@ -69,6 +69,8 @@ public abstract class EntityInsentient extends EntityLiving {
     private NBTTagCompound bx;
 
     public boolean Vegetated;
+    public boolean BreakLeash = true;
+    public boolean PullWhileLeashed = true;
     
     public EntityInsentient(World world) {
         super(world);
@@ -807,7 +809,7 @@ public abstract class EntityInsentient extends EntityLiving {
     }
 
     public final boolean c(EntityHuman entityhuman) {
-        if (this.bH() && this.getLeashHolder() == entityhuman) {
+        if (this.bH() && this.getLeashHolder() == entityhuman && BreakLeash) {
         	// CraftBukkit start
         	if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) {
         		((EntityPlayer)entityhuman).playerConnection.sendPacket(new Packet39AttachEntity(1, this, this.getLeashHolder()));
@@ -866,7 +868,7 @@ public abstract class EntityInsentient extends EntityLiving {
     }
 
     public void unleash(boolean flag, boolean flag1) {
-        if (this.bv) {
+        if (this.bv && BreakLeash) {
             this.bv = false;
             this.bw = null;
             if (!this.world.isStatic && flag1) {