Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0038-Allow-Disabling-of-Random-Lighting-Updates.patch

@@ -1,4 +1,4 @@
-From 28ebc911a44f4da8ade44040fc9a8b652c767259 Mon Sep 17 00:00:00 2001
+From 774ed3fecda98d3dedd42b5116461eb47ecae721 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
@@ -18,10 +18,10 @@ index 10efeef..2fd6a43 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2cc9005..0b6b681 100644
+index 58eacd2..0eeed14 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2024,7 +2024,7 @@ public abstract class World implements IBlockAccess {
+@@ -2034,7 +2034,7 @@ public abstract class World implements IBlockAccess {
          }
  
          this.methodProfiler.a("playerCheckLight");
@@ -47,5 +47,5 @@ index 87eac1b..aa639fe 100644
 +    }
  }
 -- 
-1.8.3.2
+1.8.4.msysgit.0