Upstream merge

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-24 16:27:12 +10:00
parent a8030addd9
commit b56d35552d
78 changed files with 483 additions and 218 deletions

View File

@@ -1,14 +1,14 @@
From b42bf264aecbc8ba6c9fa45752ad7e30222cd3c7 Mon Sep 17 00:00:00 2001
From bb365c0a557eccb818ffb7a4d018144a654e9b15 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
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 0110120..96974b4 100644
index 0eabadf..a638dba 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -906,7 +906,7 @@ public class Chunk {
@@ -901,7 +901,7 @@ public class Chunk {
}
this.m = true;
@@ -18,10 +18,10 @@ index 0110120..96974b4 100644
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 508c059..932686f 100644
index 1a2a640..ec4ce72 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2023,7 +2023,7 @@ public abstract class World implements IBlockAccess {
@@ -2113,7 +2113,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.a("playerCheckLight");