SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge, lots of conflicts

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-06-22 19:25:10 +10:00
parent 07a1436667
commit 9ab31295a9
120 changed files with 252 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch
View File

@@ -1,14 +1,14 @@
From bb365c0a557eccb818ffb7a4d018144a654e9b15 Mon Sep 17 00:00:00 2001
From 7d365125cbb0941da8dbc0894c426f4bad3cae07 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 0eabadf..a638dba 100644
index 39767d0..5ef6865 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -901,7 +901,7 @@ public class Chunk {
@@ -929,7 +929,7 @@ public class Chunk {
}
this.m = true;
@@ -18,10 +18,10 @@ index 0eabadf..a638dba 100644
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1a2a640..ec4ce72 100644
index 0cb803e..dcbf520 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2113,7 +2113,7 @@ public abstract class World implements IBlockAccess {
@@ -2107,7 +2107,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.a("playerCheckLight");