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

Update upstream

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-24 03:31:21 -05:00
parent c9747fbda3
commit d67b8b876c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 27731ddb32...b3aa7dadcd

2
current-paper
View File

@@ -1 +1 @@
1.14.1--080b3cb3d97c27af3807d2b2baf3e621c44521eb 1.14.1--5a093e0a193c8c2c936a5d9769c62a318b7b9202

6
patches/server/0001-Rebrand.patch
View File

@@ -1,4 +1,4 @@
From fe8f0a3e4e712232fa71d0296a24ce1a4c62f0e6 Mon Sep 17 00:00:00 2001 From 1e655261f55aa2c8547e09d05bc7f5a910757ab2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500 Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand Subject: [PATCH] Rebrand
@@ -83,10 +83,10 @@ index cd6e25923..bb227bc0f 100644
); );
} }
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f1cd38d42..d3316a6ac 100644 index 184f1b00f..5bd0a4cc7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1396,7 +1396,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -1408,7 +1408,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
} }
public String getServerModName() { public String getServerModName() {

8
patches/server/0019-Tick-loop-config-options.patch
View File

@@ -1,4 +1,4 @@
From 6732e24262020bd428a3591bbd4eba7bfb0d96b7 Mon Sep 17 00:00:00 2001 From 5ee60b89523ad52f1d3be24ce37cfc66e4491faf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 22 May 2019 22:30:08 -0500 Date: Wed, 22 May 2019 22:30:08 -0500
Subject: [PATCH] Tick loop config options Subject: [PATCH] Tick loop config options
@@ -9,10 +9,10 @@ Subject: [PATCH] Tick loop config options
2 files changed, 28 insertions(+), 10 deletions(-) 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d3316a6ac..21ad507f9 100644 index 5bd0a4cc7..67caf83e7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -852,16 +852,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -864,16 +864,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
lastTick = start - TICK_TIME; // Paper lastTick = start - TICK_TIME; // Paper
while (this.isRunning) { while (this.isRunning) {
@@ -43,7 +43,7 @@ index d3316a6ac..21ad507f9 100644
if ( ++MinecraftServer.currentTick % SAMPLE_INTERVAL == 0 ) if ( ++MinecraftServer.currentTick % SAMPLE_INTERVAL == 0 )
{ {
@@ -892,7 +897,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -904,7 +909,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.a(this::canSleepForTick); this.a(this::canSleepForTick);
this.methodProfiler.exitEnter("nextTickWait"); this.methodProfiler.exitEnter("nextTickWait");
this.ac = true; this.ac = true;