Update upstream

This commit is contained in:
Aikar
2018-07-22 13:10:15 -04:00
parent c025f19c31
commit 4b66f1978d
10 changed files with 33 additions and 33 deletions

View File

@@ -1,4 +1,4 @@
From 1ab4c742c0d8d9b7da4be54e6228aca0471342e9 Mon Sep 17 00:00:00 2001
From 3ba69a9113ba68ccbe0efb4fc90b93e7116a8a9e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:46:14 -0400
Subject: [PATCH] Configurable Chunk Inhabited Timer
@@ -23,7 +23,7 @@ index 1c2209270..17fb883f6 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 1c0580f79..744b5bc6d 100644
index 5d1812ab0..695c6d3b7 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -55,7 +55,7 @@ public class Chunk implements IChunkAccess {
@@ -35,7 +35,7 @@ index 1c0580f79..744b5bc6d 100644
private int B;
private final ConcurrentLinkedQueue<BlockPosition> C;
public boolean d;
@@ -1231,7 +1231,7 @@ public class Chunk implements IChunkAccess {
@@ -1228,7 +1228,7 @@ public class Chunk implements IChunkAccess {
}
public long m() {