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

fix compile

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 07:26:34 -04:00
parent 39fae5883d
commit 012e379edb
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0124-Implement-TPSBar.patch
View File

@@ -29,7 +29,7 @@ index 862825556b52bb65a003fa633f08ed42cd6ad1fa..90b192ea540c99df4d9ba8713f126cd7
this.hasLoggedStop = true; // Paper
if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index d62a17afdc9dbf75dad91326d2d14d35f0b013b1..f831481434d3bfdb7dba5068ee3fc55f78b98ca0 100644
index 6d0a0186778a115f556bbb376a9c1684f9c5740c..eb17a81e5d45892bf5623160d03197591ddc2ac1 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -347,6 +347,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -41,7 +41,7 @@ index d62a17afdc9dbf75dad91326d2d14d35f0b013b1..f831481434d3bfdb7dba5068ee3fc55f
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c18c203bdff31e8dc232380f0f917eda2c81c827..590b3c33c43abe52cd560f31047eb86f8691cccb 100644
index 6228ee10d8227d3bc8934dc22d201bdf4fc343fd..749c423c4b2da0520f2fd87530b0e486819fba1e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
@@ -69,7 +69,7 @@ index c18c203bdff31e8dc232380f0f917eda2c81c827..590b3c33c43abe52cd560f31047eb86f
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2612,5 +2615,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck);
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}
+