Simplify a few diffs

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-07-15 20:08:04 +10:00
parent 1e7be02c6b
commit 3aa2d8025a
8 changed files with 76 additions and 124 deletions

View File

@@ -97,17 +97,16 @@
if (chunk == null) {
long k = ChunkCoordIntPair.a(i, j);
@@ -100,7 +168,8 @@
@@ -100,7 +168,7 @@
this.chunks.put(k, chunk);
chunk.addEntities();
- chunk.loadNearby(this, this.chunkGenerator);
+
+ chunk.loadNearby(this, this.chunkGenerator, true); // CraftBukkit
}
return chunk;
@@ -146,10 +215,12 @@
@@ -146,10 +214,12 @@
public boolean a(boolean flag) {
int i = 0;
@@ -123,7 +122,7 @@
if (flag) {
this.saveChunkNOP(chunk);
@@ -182,10 +253,12 @@
@@ -182,10 +252,12 @@
Chunk chunk = (Chunk) this.chunks.get(olong);
if (chunk != null && chunk.d) {
@@ -140,7 +139,7 @@
++i;
}
}
@@ -197,6 +270,40 @@
@@ -197,6 +269,40 @@
return false;
}