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@d8d59e0 Fix NPE sending resource pack without prompt
PaperMC/Paper@5a9afbe Fixes issues in the suppress dismount cancellation patch (#10735)
PaperMC/Paper@0ad09de Make PaperSimplePluginClassLoader show class which is not found
This commit is contained in:
granny
2024-05-19 15:11:01 -07:00
parent 9dcfdf13c2
commit 88aa731cf3
14 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0114-Implement-TPSBar.patch
View File

@@ -41,7 +41,7 @@ index 6dc0101193c5a1a8850f849d4459462f00ce30e8..04accfaeba1beb564db7205c81d8481d
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index d2a7eef0a1205cc6d6183b5a9b9a9c060cdb886d..418baa1d3977af2082e6b6ff17437af0841cc507 100644
index f19897177d9e4bfde145f3eb9de5adf7bbe8c2a4..742c97e226987bccee3f1950ccee8755dddff11c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -299,6 +299,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index d2a7eef0a1205cc6d6183b5a9b9a9c060cdb886d..418baa1d3977af2082e6b6ff17437af0
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2986,5 +2989,13 @@ public class ServerPlayer extends Player {
@@ -2992,5 +2995,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);
}
}