Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-21 15:59:23 +00:00
Code Issues Releases Activity

Updated Upstream (Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@e86a1b6 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-11-04 00:45:28 +03:00
parent deacaf316e
commit 6cb50245b5
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
mcVersion = 1.21.3 mcVersion = 1.21.3
version = 1.21.3-R0.1-SNAPSHOT version = 1.21.3-R0.1-SNAPSHOT
purpurRef = c6802b0a27f1f8faac4ad30f902810fd0ed8051e purpurRef = e86a1b6801b3f00280b860a9762be773698b0a5e
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

15
patches/unapplied/server/0014-Fix-MC-183518.patch → patches/server/0049-Fix-MC-183518.patch
View File

@@ -7,13 +7,22 @@ Issue on Mojira: https://bugs.mojang.com/browse/MC-183518
P.S. Btw, I took this fix from this PR - https://github.com/Winds-Studio/Leaf/pull/69 P.S. Btw, I took this fix from this PR - https://github.com/Winds-Studio/Leaf/pull/69
diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
index 2510589400b3012b827efcab477c6483d9d55901..e64af5ac326786d006adf1ad6d31254cfddebcb1 100644 index 9b706276dc5b5f55b966c5472c6c4e864342b916..e9f2b88058bea5841fa648dad32903af19293328 100644
--- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java --- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
+++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java +++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
@@ -142,8 +142,7 @@ public abstract class BlockableEventLoop<R extends Runnable> implements Profiler @@ -22,7 +22,7 @@ import net.minecraft.util.profiling.metrics.ProfilerMeasured;
import org.slf4j.Logger;
public abstract class BlockableEventLoop<R extends Runnable> implements ProfilerMeasured, TaskScheduler<R>, Executor {
- public static final long BLOCK_TIME_NANOS = 100000L;
+ public static final long BLOCK_TIME_NANOS = 2000000L; // DivineMC - Fix MC-183518
private final String name;
private static final Logger LOGGER = LogUtils.getLogger();
private final Queue<R> pendingRunnables = Queues.newConcurrentLinkedQueue();
@@ -145,8 +145,7 @@ public abstract class BlockableEventLoop<R extends Runnable> implements Profiler
} }
public void waitForTasks() { protected void waitForTasks() {
- Thread.yield(); - Thread.yield();
- LockSupport.parkNanos("waiting for tasks", 100000L); - LockSupport.parkNanos("waiting for tasks", 100000L);
+ LockSupport.parkNanos("waiting for tasks", 2000000L); // DivineMC - Fix MC-183518 + LockSupport.parkNanos("waiting for tasks", 2000000L); // DivineMC - Fix MC-183518