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)

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

Paper Changes:
PaperMC/Paper@a0b59ca [ci skip] Update paperweight to 1.4.1
PaperMC/Paper@035f9d7 Fix items never falling after being on ground (#8768)
PaperMC/Paper@214a8c5 Use single player info update packet on join (#8773)
This commit is contained in:
Encode42
2023-01-08 22:04:14 -05:00
parent 9b9dbeec08
commit 2f8ae1bc6d
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,10 +85,10 @@ index d0a76519d85d4c9e4dc0b98d038a4c447ce5e833..62fa71b3f9fe488c3b7d44d5c2948947
// 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 4769512fe2ca9f6704a3bd2e6dfebdecd46f698d..79578c45c23048de0fbc1d0f09efb7b39629799d 100644
index f2cfcefefaf71ba0f49a1aea34886fd9cb7b69e2..fb06e34821db74a4af4bd56392a5aaae839a8387 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -449,6 +449,7 @@ public abstract class PlayerList {
@@ -455,6 +455,7 @@ public abstract class PlayerList {
scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
}
// Paper end
@@ -96,7 +96,7 @@ index 4769512fe2ca9f6704a3bd2e6dfebdecd46f698d..79578c45c23048de0fbc1d0f09efb7b3
// 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());
}
@@ -558,6 +559,8 @@ public abstract class PlayerList {
@@ -564,6 +565,8 @@ public abstract class PlayerList {
}
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
// Paper end