Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream ()

Browse Source 
Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
BillyGalbreath
2022-11-13 04:52:10 -06:00
parent f72fd9b28b
commit 85bc4a4a83
18 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ index 24b7ae3253b0710954d4a522114fc0617c0ef3b3..d24216e1d9dcf8e9b68aabd622881a00
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 8bbb5a80956a0b25a3ef37351cf57f2646bf8f26..49a828e2c8859352a6a16b1ea43547dbcde1b9ba 100644
index 691ee44d766fee9d47daea138d4589b11d0778cc..02b4c685562c125185387d3842fd0f837a04b020 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index 8bbb5a80956a0b25a3ef37351cf57f2646bf8f26..49a828e2c8859352a6a16b1ea43547db
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2630,5 +2633,13 @@ public class ServerPlayer extends Player {
@@ -2632,5 +2635,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}
@@ -83,7 +83,7 @@ index 8bbb5a80956a0b25a3ef37351cf57f2646bf8f26..49a828e2c8859352a6a16b1ea43547db
// 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 ebec09ff2816f5212d032847cf7cde4e4aeef82c..1d369d4a540f4b4731c3a07d2b70256462de34f3 100644
index b59b52702dcfca5a68b7f68dad310a4ec5a41ebe..c620713b8575e95cfddca01a17e8cd08a641753b 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -503,6 +503,7 @@ public abstract class PlayerList {