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

Updated Upstream (Paper & Pufferfish)

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

Paper Changes:
PaperMC/Paper@eff22eb Ensure players are removed from pendingLogin

Pufferfish Changes:
pufferfish-gg/Pufferfish@31d0ff3 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@4882a95 Fix PAPI edge-case
pufferfish-gg/Pufferfish@254c002 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@4b26a0b Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2c1e02e Updated Upstream (Paper)
pufferfish-gg/Pufferfish@3888607 Update DAB entities
This commit is contained in:
BillyGalbreath
2022-08-29 12:33:47 -05:00
parent 7005356a4d
commit ef2160f5bf
34 changed files with 255 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0125-Implement-TPSBar.patch
View File

@@ -29,10 +29,10 @@ index eb12fed7ee6d7d3a5f5b9e99d8f11b38122cac7e..872632875d1569dd348c78983b260ebe
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 956e21a45e82e288efa40100d7b4f0f05f5aa6e5..4bd120ab4d19052ed769c4dd8a682650f0020bbc 100644
index 629024e5c3f480bd50ae2df9dadb72f06a62c3bf..19bf680e222d7f91a0e7f67b29e3a5e38a35c1e7 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -352,6 +352,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -351,6 +351,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
}
if (gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
@@ -83,10 +83,10 @@ index 725358518b73b908c8150bdbabed68909c91f4d4..b858ce2ad443f6690dd71e56fb9eea14
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 22fde2975bc5d66bd60ce0325945ee7c5afac55e..d1acb410384899866458fbb8b63284a0148c92f2 100644
index 80be27593ce08a0acb01fde04994ed60975a7a7f..b82000ecb5c5f61422e1a9c34ef1d2924d447d4b 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -499,6 +499,7 @@ public abstract class PlayerList {
@@ -506,6 +506,7 @@ public abstract class PlayerList {
scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
}
// Paper end
@@ -94,7 +94,7 @@ index 22fde2975bc5d66bd60ce0325945ee7c5afac55e..d1acb410384899866458fbb8b63284a0
// CraftBukkit - Moved from above, added world
PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
}
@@ -609,6 +610,8 @@ public abstract class PlayerList {
@@ -616,6 +617,8 @@ public abstract class PlayerList {
}
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
// Paper end