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

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@e56e53f Fix some component bugs in login disconnect packet (#10090)
PaperMC/Paper@3484ae9 Call entity_die game event after event cancel check (#10096)
PaperMC/Paper@0ae58c0 cleanup player death event adventure logic (#10095)
This commit is contained in:
granny
2023-12-29 23:36:48 -08:00
parent 04ee5e7c28
commit c049bfbd53
16 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ index 5ebe7e5c4f12ccb8a91a1e6a0f029d0f54b09e15..68d607dfed0130f1003951b4ac56d91b
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 82a551caa75fbd50d75a5109cf7e897e829acf19..448394f5ff2d55b099549b49b77114483f0e58bd 100644
index ea37e30846c496f92ceab7cee0cb19ffd82cfc0a..e7b654c1991348a7f73ca8bc950d776e4e708779 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -282,6 +282,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index 82a551caa75fbd50d75a5109cf7e897e829acf19..448394f5ff2d55b099549b49b7711448
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2877,5 +2880,13 @@ public class ServerPlayer extends Player {
@@ -2878,5 +2881,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH);
}
}
@@ -83,7 +83,7 @@ index 82a551caa75fbd50d75a5109cf7e897e829acf19..448394f5ff2d55b099549b49b7711448
// 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 e46fcb5c8bf1047e3f330fd525166aee5f0b646b..61a34f3e49b21254984011bc470d72c86d55dba1 100644
index 0ced4627e0374d7e9fcbff256505b190021efd3f..3b5102017258339cda813e105dd2141b067b9f5d 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -486,6 +486,7 @@ public abstract class PlayerList {