Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 18:28:15 +02: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@e01ddf4 Fixup porting issue in vanillaBiomeProvider impl (#11185)
PaperMC/Paper@509ea2f Fix horse armor desync (#11341)
PaperMC/Paper@2f0891e Fix InventoryOpenEvent cancellation (#11304)
PaperMC/Paper@227c94a Fix inventory desync when placing blocks with spawn protection (#11090)
This commit is contained in:
granny
2024-08-31 20:37:16 -07:00
parent 5c0d2f785a
commit 49db8494f1
14 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ index ca9afa93a9c43208ef64f86d534e5540d34a6b09..e0f7c6fa2a545d54135da6357440b79a
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 6df90eecd59421972661a297519325de5e44908e..97e05432626ae78b3ac91d41bbe0784c61d3d184 100644
index 0b57d9a2e2573bdb41c9e163d953130c3a4a1747..6100c35a54a9f597bb7e4925bf2c63aa7e0d64d3 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -303,6 +303,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -68,7 +68,7 @@ index 6df90eecd59421972661a297519325de5e44908e..97e05432626ae78b3ac91d41bbe0784c
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -3063,5 +3066,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -3067,5 +3070,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
this.server.getPlayerList().respawn(this, true, RemovalReason.KILLED, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH, to);
}
}
@@ -83,7 +83,7 @@ index 6df90eecd59421972661a297519325de5e44908e..97e05432626ae78b3ac91d41bbe0784c
// 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 105688ba795676a0612969f89668c9c8bda48f54..8b02ceeb89286c09ece26054ebe70a61c296dfd6 100644
index d13270623d0630f94c7911bd8a544f1ee9449b17..cac3aa0308b4f9a4c563840f974651d20bdf195f 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -480,6 +480,7 @@ public abstract class PlayerList {