Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@c613877 Fix incorrect crafting result amount for fireworks (#9322)
PaperMC/Paper@b169678 ratelimited packet is logged to console on kick (#9292)
PaperMC/Paper@206dd3a Fix incorrect phantom spawning entity (#9385)
PaperMC/Paper@aea9cdd Fix interact event call override (#9387)
PaperMC/Paper@b34d4ec Fix cycle on paper plugin toString (#9392)
PaperMC/Paper@e8bec64 Fix ugly java logger format for paper plugin dependency loader (#9395)

Pufferfish Changes:
pufferfish-gg/Pufferfish@21ed3a2 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@f28130c Updated Upstream (Paper)
pufferfish-gg/Pufferfish@25f942d Fix entity ttl patch bug causing some entities to not be removed
pufferfish-gg/Pufferfish@13dd49d Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2a6b66a Fix 'Already Retired' bug
pufferfish-gg/Pufferfish@a1ed6f7 Attempt fixing PaperMC/Paper#9372
pufferfish-gg/Pufferfish@5587825 Holy whitespace
pufferfish-gg/Pufferfish@ad7419e Pull PaperMC/Paper#9377 downstream
This commit is contained in:
granny
2023-06-25 15:35:40 -07:00
parent 8331f1bba8
commit 7ed65d47b4
12 changed files with 85 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0119-Implement-TPSBar.patch
View File

@@ -17,7 +17,7 @@ index e5b1b6ad32c48a4ba13b4930954fad18669677ad..4e721dfca7559620d8ce65a6703f2089
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a8ca0d0b4bb6474f20c448439f517e280a480f50..f69ea0d2137419079d8ee59e009fcebab8f3d7e6 100644
index 33db30876d45adabec7e3535ddb688659eee8d6e..a507c1fe296039bcf07e8fd564c9a4ec9ffb0c25 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1023,6 +1023,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -41,7 +41,7 @@ index cf7c7b3cd4081e1be059647dca237ffd72c374df..012c990efb2647b0a3e983b23fed98c6
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 3997d78770c503802bd354819d0258c16329858d..c177b6ebf0e2d10d19674094a4fed8637d305bda 100644
index 7e0bb25390f62b34375576da3e8c9dc3860e296f..6408bc1749c08fe5255c054bf4342e0870db2a20 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -279,6 +279,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index 3997d78770c503802bd354819d0258c16329858d..c177b6ebf0e2d10d19674094a4fed863
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2788,5 +2791,13 @@ public class ServerPlayer extends Player {
@@ -2792,5 +2795,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 3997d78770c503802bd354819d0258c16329858d..c177b6ebf0e2d10d19674094a4fed863
// 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 7ae44092d3a585791d7a2267cfb6b710a9bc037d..3cd656afdd612c265c812233736f5f343c0a6e48 100644
index da3a4b30ea1fde75d616a0aaf7e85e4783a9f13a..d057f0f6755595fc5e1fce7ed09b1fc60906d9cb 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -476,6 +476,7 @@ public abstract class PlayerList {