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 appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9cab01e [ci skip] Update Gradle wrapper to 7.4
PaperMC/Paper@cdb893b Add mid-tick task execution to block ticking
PaperMC/Paper@854f3d3 Put world into worldlist before initing the world
PaperMC/Paper@db81163 Execute mid tick tasks during tile entity ticking
PaperMC/Paper@501834e Fix custom inventory holders (#6199)
PaperMC/Paper@04a337a Add some missing deprecations to the adventure patch (#7500)
PaperMC/Paper@b6dad9c Fix desync on teleporting entity on first tick (#7183)
PaperMC/Paper@2a55e35 Option to have default CustomSpawners in custom worlds (#7493)
PaperMC/Paper@bfa50ad Custom Potion Mixes (#6744)
This commit is contained in:
BillyGalbreath
2022-02-23 09:40:25 -06:00
parent 52228a11c1
commit 4afe68b005
28 changed files with 105 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0015-Lagging-threshold.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c386c146362138dbf8f397101ad91b3da6b72883..04439c7a4dcc45ae57aca2e090064a74e4230e95 100644
index 61526c349ad91742e3d05f49e658ffd293a450a5..3e68a5d2a9f187025952a5168a2c44df23565bb0 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -304,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index c386c146362138dbf8f397101ad91b3da6b72883..04439c7a4dcc45ae57aca2e090064a74
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
public static long currentTickLong = 0L; // Paper
@@ -1249,6 +1250,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1258,6 +1259,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.recentTps[1] = tps5.getAverage();
this.recentTps[2] = tps15.getAverage();
// Paper end
@@ -25,10 +25,10 @@ index c386c146362138dbf8f397101ad91b3da6b72883..04439c7a4dcc45ae57aca2e090064a74
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e8ff8dea26eb464804b950a4e9af74451e33ed17..136f93f18414a7968ca85d134218ebaa3cb5e03b 100644
index 15d196769401a30ee317ce6f19b1a4a13af9135e..99ada5b70b6248b05c2965552105a1320a80a155 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2876,5 +2876,10 @@ public final class CraftServer implements Server {
@@ -2883,5 +2883,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}