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)

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

Paper Changes:
PaperMC/Paper@5fca3ae update generated API
PaperMC/Paper@188cff2 remove old vanilla goals
PaperMC/Paper@ffe310a remove api that was scheduled for removal
This commit is contained in:
granny
2024-06-14 16:59:59 -07:00
parent cfc96e0c93
commit 59c536c0e1
10 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ index 36351e029c55ccd67b460e90f8c74e3d87f8ae5a..70b0d8f18df7380d54a9c28e0d906096
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index d45990c793cd11a1e443af59738d47a21877f417..20fcf96f5cc89631cc993168f009e91c5bd57c48 100644
index 69c99aec32b89c3966eac70f636d70756b6b57d0..25ffc18a6f00abcd6e2782b7977307c6db4748ec 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -297,6 +297,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -68,7 +68,7 @@ index d45990c793cd11a1e443af59738d47a21877f417..20fcf96f5cc89631cc993168f009e91c
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -3022,5 +3025,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -3021,5 +3024,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.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 d45990c793cd11a1e443af59738d47a21877f417..20fcf96f5cc89631cc993168f009e91c
// 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 09595bbd536fc84d309163923317a860f606ea7c..b6289dbad3d2a840dfef9505127a343f032f1da5 100644
index c7aa9b26bfb67d889d8a95daa77142ae6ad12463..c6705a337844ee79a13ce4acddb9c9fba78b1206 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 {