Upstream merge: 1.7.9

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0094-Highly-Optimized-Tick-Loop.patch

@@ -1,11 +1,11 @@
-From 94ecacd1a98659fa044569f98daf4f118ee305b3 Mon Sep 17 00:00:00 2001
+From 45ebc973b86bf0604e180ae7a6b2d3ecc7ccd534 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 25 Jan 2014 14:08:35 +1100
 Subject: [PATCH] Highly Optimized Tick Loop
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8738e28..170e097 100644
+index b52c101..b905ceb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -107,6 +107,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -36,7 +36,7 @@ index 8738e28..170e097 100644
          try {
              if (this.init()) {
 @@ -442,38 +455,34 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
-                 this.q.setServerInfo(new ServerPingServerData("1.7.8", 5));
+                 this.q.setServerInfo(new ServerPingServerData("1.7.9", 5));
                  this.a(this.q);
  
 +                // Spigot start
@@ -161,5 +161,5 @@ index 0000000..2b8343d
 +    }
 +}
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0