From 61a7a0633c9a4229288031f915867afac3df6422 Mon Sep 17 00:00:00 2001
From: Dinnerbone <dinnerbone@dinnerbone.com>
Date: Thu, 30 Jun 2011 15:47:36 +0100
Subject: [PATCH] Update to minecraft 1.7_01

---
 pom.xml                                       |  2 +-
 .../net/minecraft/server/MinecraftServer.java |  2 +-
 src/main/java/net/minecraft/server/World.java | 54 +++++++++----------
 .../org/bukkit/craftbukkit/CraftServer.java   |  2 +-
 4 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index ec2980428b..388fd84de9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>minecraft-server</artifactId>
-      <version>1.7</version>
+      <version>1.7_01</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1692800055..625d8cc8e9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -89,7 +89,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
         System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true));
         // CraftBukkit end
 
-        log.info("Starting minecraft server version Beta 1.7");
+        log.info("Starting minecraft server version Beta 1.7_01");
         if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
             log.warning("**** NOT ENOUGH RAM!");
             log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 494c2262ee..5f2d404d6b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1609,44 +1609,38 @@ public class World implements IBlockAccess {
             ++A;
 
             try {
-                if (A == 50) {
-                    return;
-                }
+                if (A != 50) {
+                    int k1 = (l + i) / 2;
+                    int l1 = (j1 + k) / 2;
 
-                int k1 = (l + i) / 2;
-                int l1 = (j1 + k) / 2;
+                    if (this.isLoaded(k1, 64, l1)) {
+                        if (!this.getChunkAtWorldCoords(k1, l1).isEmpty()) {
+                            int i2 = this.C.size();
+                            int j2;
 
-                if (this.isLoaded(k1, 64, l1)) {
-                    if (this.getChunkAtWorldCoords(k1, l1).isEmpty()) {
-                        return;
-                    }
+                            if (flag) {
+                                j2 = 5;
+                                if (j2 > i2) {
+                                    j2 = i2;
+                                }
 
-                    int i2 = this.C.size();
-                    int j2;
+                                for (int k2 = 0; k2 < j2; ++k2) {
+                                    MetadataChunkBlock metadatachunkblock = (MetadataChunkBlock) this.C.get(this.C.size() - k2 - 1);
 
-                    if (flag) {
-                        j2 = 5;
-                        if (j2 > i2) {
-                            j2 = i2;
-                        }
+                                    if (metadatachunkblock.a == enumskyblock && metadatachunkblock.a(i, j, k, l, i1, j1)) {
+                                        return;
+                                    }
+                                }
+                            }
 
-                        for (int k2 = 0; k2 < j2; ++k2) {
-                            MetadataChunkBlock metadatachunkblock = (MetadataChunkBlock) this.C.get(this.C.size() - k2 - 1);
-
-                            if (metadatachunkblock.a == enumskyblock && metadatachunkblock.a(i, j, k, l, i1, j1)) {
-                                return;
+                            this.C.add(new MetadataChunkBlock(enumskyblock, i, j, k, l, i1, j1));
+                            j2 = 1000000;
+                            if (this.C.size() > 1000000) {
+                                System.out.println("More than " + j2 + " updates, aborting lighting updates");
+                                this.C.clear();
                             }
                         }
                     }
-
-                    this.C.add(new MetadataChunkBlock(enumskyblock, i, j, k, l, i1, j1));
-                    j2 = 1000000;
-                    if (this.C.size() > 1000000) {
-                        System.out.println("More than " + j2 + " updates, aborting lighting updates");
-                        this.C.clear();
-                    }
-
-                    return;
                 }
             } finally {
                 --A;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 99a3b81af9..ba30a30dd9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -65,7 +65,7 @@ import org.bukkit.util.config.ConfigurationNode;
 public final class CraftServer implements Server {
     private final String serverName = "Craftbukkit";
     private final String serverVersion;
-    private final String protocolVersion = "1.7";
+    private final String protocolVersion = "1.7_01";
     private final ServicesManager servicesManager = new SimpleServicesManager();
     private final BukkitScheduler scheduler = new CraftScheduler(this);
     private final SimpleCommandMap commandMap = new SimpleCommandMap(this);