Merge branch 'master' into minestrike-update

Patches/CraftBukkit-Patches/0175-Fix-schedulers.patch

@@ -0,0 +1,37 @@
+From 896df3218cf190a29901619e762b5399517dbfbd Mon Sep 17 00:00:00 2001
+From: libraryaddict <libraryaddict115@yahoo.co.nz>
+Date: Wed, 11 Nov 2015 11:43:17 +1300
+Subject: [PATCH] Fix schedulers
+
+
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 1d29ae7..55e2afd 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -705,6 +705,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+     }
+ 
+     public void B() {
++        SpigotTimings.schedulerTimer.startTiming(); // Spigot
++        // CraftBukkit start
++        this.server.getScheduler().mainThreadHeartbeat(this.ticks);
++        SpigotTimings.schedulerTimer.stopTiming(); // Spigot
++
+         this.methodProfiler.a("jobs");
+         Queue queue = this.j;
+ 
+@@ -718,11 +723,6 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+ 
+         this.methodProfiler.c("levels");
+ 
+-        SpigotTimings.schedulerTimer.startTiming(); // Spigot
+-        // CraftBukkit start
+-        this.server.getScheduler().mainThreadHeartbeat(this.ticks);
+-        SpigotTimings.schedulerTimer.stopTiming(); // Spigot
+-
+         // Run tasks that are waiting on processing
+         SpigotTimings.processQueueTimer.startTiming(); // Spigot
+         while (!processQueue.isEmpty()) {
+-- 
+1.9.5.msysgit.0
+

Plugins/Mineplex.Core/src/mineplex/core/PacketsInteractionFix.java

@@ -55,7 +55,7 @@ public class PacketsInteractionFix extends MiniPlugin implements IPacketHandler
 		_leftClicked.clear();
 	}
 
-	@EventHandler
+	//@EventHandler
 	public void onArmAnimation(PlayerAnimationEvent event)
 	{
 		if (event.getAnimationType() != PlayerAnimationType.ARM_SWING)
@@ -110,7 +110,7 @@ public class PacketsInteractionFix extends MiniPlugin implements IPacketHandler
 		}
 	}
 
-	@EventHandler
+	//@EventHandler
 	public void onPlayerInteract(PlayerInteractEvent event)
 	{
 		if (!event.getAction().name().contains("LEFT"))

Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java

@@ -134,9 +134,10 @@ public class Chat extends MiniPlugin
 	public void preventMe(PlayerCommandPreprocessEvent event)
 	{
 		if (event.getMessage().toLowerCase().startsWith("/me ")
-				|| event.getMessage().toLowerCase().startsWith("/bukkit"))
+				|| event.getMessage().toLowerCase().startsWith("/bukkit")
+				|| event.getMessage().toLowerCase().startsWith("/minecraft"))
 		{
-			event.getPlayer().sendMessage(F.main(getName(), "No, you!"));
+			event.getPlayer().sendMessage(F.main(getName(), "Nope, not allowed!"));
 			event.setCancelled(true);
 		}
 	}