Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-24 09:58:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug in last commit

Browse Source
This commit is contained in:
Aikar 2018-09-22 12:28:38 -04:00
parent e07e0cb3ca
commit 1556158be3
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Spigot-Server-Patches/0028-Lighting-Queue.patch
View File

@ -1,4 +1,4 @@
From 9cf6515af10a67c0778bbd697d12254907ad766a Mon Sep 17 00:00:00 2001 From c4dc3979a681aac06deeda8f8a3ff0939108b413 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 00:52:31 -0600 Date: Wed, 2 Mar 2016 00:52:31 -0600
Subject: [PATCH] Lighting Queue Subject: [PATCH] Lighting Queue
@ -159,10 +159,10 @@ index d6ea4ae532..5086fe4027 100644
} }
diff --git a/src/main/java/net/minecraft/server/PaperLightingQueue.java b/src/main/java/net/minecraft/server/PaperLightingQueue.java diff --git a/src/main/java/net/minecraft/server/PaperLightingQueue.java b/src/main/java/net/minecraft/server/PaperLightingQueue.java
new file mode 100644 new file mode 100644
index 0000000000..f3d6eb7694 index 0000000000..84e313bf8c
--- /dev/null --- /dev/null
+++ b/src/main/java/net/minecraft/server/PaperLightingQueue.java +++ b/src/main/java/net/minecraft/server/PaperLightingQueue.java
@@ -0,0 +1,91 @@ @@ -0,0 +1,98 @@
+package net.minecraft.server; +package net.minecraft.server;
+ +
+import co.aikar.timings.Timing; +import co.aikar.timings.Timing;
@ -177,6 +177,10 @@ index 0000000000..f3d6eb7694
+ final long startTime = System.nanoTime(); + final long startTime = System.nanoTime();
+ final long maxTickTime = MAX_TIME - (startTime - curTime); + final long maxTickTime = MAX_TIME - (startTime - curTime);
+ +
+ if (maxTickTime <= 0) {
+ return;
+ }
+
+ START: + START:
+ for (World world : MinecraftServer.getServer().getWorlds()) { + for (World world : MinecraftServer.getServer().getWorlds()) {
+ if (!world.paperConfig.queueLightUpdates) { + if (!world.paperConfig.queueLightUpdates) {
@ -212,13 +216,16 @@ index 0000000000..f3d6eb7694
+ if (this.isEmpty()) { + if (this.isEmpty()) {
+ return false; + return false;
+ } + }
+ if (isOutOfTime(maxTickTime, startTime)) {
+ return true;
+ }
+ try (Timing ignored = chunk.world.timings.lightingQueueTimer.startTiming()) { + try (Timing ignored = chunk.world.timings.lightingQueueTimer.startTiming()) {
+ Runnable lightUpdate; + Runnable lightUpdate;
+ while ((lightUpdate = this.poll()) != null) { + while ((lightUpdate = this.poll()) != null) {
+ if (startTime > 0 && isOutOfTime(maxTickTime, System.nanoTime() - startTime)) { + lightUpdate.run();
+ if (isOutOfTime(maxTickTime, startTime)) {
+ return true; + return true;
+ } + }
+ lightUpdate.run();
+ } + }
+ } + }
+ +
@ -234,7 +241,7 @@ index 0000000000..f3d6eb7694
+ } + }
+ processQueue(0, 0); // No timeout + processQueue(0, 0); // No timeout
+ +
+ final int radius = 1; // TODO: bitflip, why should this ever be 2? + final int radius = 1;
+ for (int x = chunk.locX - radius; x <= chunk.locX + radius; ++x) { + for (int x = chunk.locX - radius; x <= chunk.locX + radius; ++x) {
+ for (int z = chunk.locZ - radius; z <= chunk.locZ + radius; ++z) { + for (int z = chunk.locZ - radius; z <= chunk.locZ + radius; ++z) {
+ if (x == chunk.locX && z == chunk.locZ) { + if (x == chunk.locX && z == chunk.locZ) {
@ -250,8 +257,8 @@ index 0000000000..f3d6eb7694
+ } + }
+ } + }
+ +
+ private static boolean isOutOfTime(long maxTickTime, long l) { + private static boolean isOutOfTime(long maxTickTime, long startTime) {
+ return l > maxTickTime; + return startTime > 0 && System.nanoTime() - startTime > maxTickTime;
+ } + }
+} +}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java