Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57: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@efd47e3 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9188)
PaperMC/Paper@1edfefd Add option to flush region files on save (#9149)
PaperMC/Paper@9daa019 Added wither vanilla invulnerability API (#9124)
This commit is contained in:
granny
2023-05-12 22:22:02 -07:00
parent 84da84887e
commit 3325421436
79 changed files with 323 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0120-Implement-TPSBar.patch
View File

@@ -42,10 +42,10 @@ index ca6a2fee12ac8a89dae57aa2787462f190463cd0..e0b2819d6c73a9ca1fa60ff71d29e201
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index dc1cffa39659505f44ee81a38066c274fda09a43..a7f674f456be825bbabb2c86c93afde77db96a33 100644
index 02078f459eb7230a5ac9b4499d961c8b37e5b196..06c225972d5a92296042ff612634f81298b32107 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -277,6 +277,7 @@ public class ServerPlayer extends Player {
@@ -279,6 +279,7 @@ public class ServerPlayer extends Player {
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
public boolean purpurClient = false; // Purpur
public boolean acceptingResourcePack = false; // Purpur
@@ -53,7 +53,7 @@ index dc1cffa39659505f44ee81a38066c274fda09a43..a7f674f456be825bbabb2c86c93afde7
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
@@ -516,6 +517,7 @@ public class ServerPlayer extends Player {
@@ -518,6 +519,7 @@ public class ServerPlayer extends Player {
}
}
@@ -61,7 +61,7 @@ index dc1cffa39659505f44ee81a38066c274fda09a43..a7f674f456be825bbabb2c86c93afde7
}
@Override
@@ -582,6 +584,7 @@ public class ServerPlayer extends Player {
@@ -584,6 +586,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -69,7 +69,7 @@ index dc1cffa39659505f44ee81a38066c274fda09a43..a7f674f456be825bbabb2c86c93afde7
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2685,5 +2688,13 @@ public class ServerPlayer extends Player {
@@ -2698,5 +2701,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);
}
}
@@ -84,10 +84,10 @@ index dc1cffa39659505f44ee81a38066c274fda09a43..a7f674f456be825bbabb2c86c93afde7
// 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 2069633c7fc3af7cef94e92ff03da6c9198c4524..25be7c9e59666f27161d8f08129019764a70a512 100644
index 68905d5121eb05b825602d2bf24612283481c205..cfe70ad065f7c5919faad67b171b9dbbabaea51c 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -467,6 +467,7 @@ public abstract class PlayerList {
@@ -469,6 +469,7 @@ public abstract class PlayerList {
scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
}
// Paper end
@@ -95,7 +95,7 @@ index 2069633c7fc3af7cef94e92ff03da6c9198c4524..25be7c9e59666f27161d8f0812901976
// CraftBukkit - Moved from above, added world
PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
}
@@ -576,6 +577,8 @@ public abstract class PlayerList {
@@ -578,6 +579,8 @@ public abstract class PlayerList {
}
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
// Paper end
@@ -105,7 +105,7 @@ index 2069633c7fc3af7cef94e92ff03da6c9198c4524..25be7c9e59666f27161d8f0812901976
entityplayer.awardStat(Stats.LEAVE_GAME);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 126eb32d182b78b07add872aad6a821334639662..5b0625955e2a65f689c8a128d73170bc1f0c8025 100644
index ce59c8dbbf6cdc684befe9302107645795576e48..74882c48068d01d59adbfc0c51bd7f2b7f756e6a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -181,6 +181,7 @@ public class PurpurConfig {