Upstream merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-09 18:00:58 +11:00
parent 987080283a
commit a6e7c7a91e
46 changed files with 106 additions and 401 deletions

View File

@@ -1,4 +1,4 @@
From b41a6f127eb5532a265a8ee45a630d65ce575dc0 Mon Sep 17 00:00:00 2001
From cc40d3ae5934613369a65ff132206e31ddb6d6e2 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 3bcca91..efe7ca5 100644
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6965e82..6997d03 100644
index 2e3597f..4db02ce 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2038,7 +2038,7 @@ public abstract class World implements IBlockAccess {
@@ -2044,7 +2044,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.a("playerCheckLight");