Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
48b6bfe2 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-07-23 16:16:17 -05:00
parent c2720f58c2
commit 917620e80d
9 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0017-Tick-loop-config-options.patch
View File

@@ -1,4 +1,4 @@
From 4c9be6333a4625551d09e1575142108ecf630815 Mon Sep 17 00:00:00 2001
From 3a5b1a6a3ccfa7c91eafd9f0bec09662aa5a16ba Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 22 May 2019 22:30:08 -0500
Subject: [PATCH] Tick loop config options
@@ -9,10 +9,10 @@ Subject: [PATCH] Tick loop config options
2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 8d3361e8c7..a45db15075 100644
index 57a1ab8b9e..d5a9a5f069 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -880,16 +880,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -878,16 +878,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
lastTick = start - TICK_TIME; // Paper
while (this.isRunning) {
@@ -43,7 +43,7 @@ index 8d3361e8c7..a45db15075 100644
if ( ++MinecraftServer.currentTick % SAMPLE_INTERVAL == 0 )
{
@@ -920,7 +925,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -918,7 +923,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.a(this::canSleepForTick);
this.methodProfiler.exitEnter("nextTickWait");
this.ac = true;
@@ -59,7 +59,7 @@ index 8d3361e8c7..a45db15075 100644
this.methodProfiler.exit();
this.methodProfiler.b();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index bb91a4a67c..cbb163c0dc 100644
index a02b1c2667..4d0d7a9dad 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -131,6 +131,13 @@ public class PurpurConfig {