Upstream merge.

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

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

@@ -0,0 +1,27 @@
+From 576ae6ea5b3348156429e5a72987eaf6184be3df 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 413e3d8..d186e47 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -498,11 +498,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+         this.H = Packet.p;
+         this.methodProfiler.b();
+         this.methodProfiler.a("snooper");
+-        if (!this.n.d() && this.ticks > 100) {
++        if (getSnooperEnabled() && !this.n.d() && this.ticks > 100) { // Spigot
+             this.n.a();
+         }
+ 
+-        if (this.ticks % 6000 == 0) {
++        if (getSnooperEnabled() && this.ticks % 6000 == 0) { // Spigot
+             this.n.b();
+         }
+ 
+-- 
+1.8.1.2
+