Upstream merge

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0051-Fully-Disable-Snooper-When-Not-Required.patch

@@ -0,0 +1,27 @@
+From aea228d0d70cb6b17ad2623d19b41c95d7f5a51f Mon Sep 17 00:00:00 2001
+From: agentk20 <agentkid20@gmail.com>
+Date: Sat, 3 Aug 2013 19:28:48 +1000
+Subject: [PATCH] Fully Disable Snooper When Not Required
+
+
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 9543509..6b5e092 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -551,11 +551,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+         this.f[this.ticks % 100] = System.nanoTime() - i;
+         this.methodProfiler.b();
+         this.methodProfiler.a("snooper");
+-        if (!this.k.d() && this.ticks > 100) {
++        if (getSnooperEnabled() && !this.k.d() && this.ticks > 100) { // Spigot
+             this.k.a();
+         }
+ 
+-        if (this.ticks % 6000 == 0) {
++        if (getSnooperEnabled() && this.ticks % 6000 == 0) { // Spigot
+             this.k.b();
+         }
+ 
+-- 
+1.8.3.2
+