Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +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@1cda66e Hotfix Entity isInRain reobf issue
PaperMC/Paper@61768e0 [ci skip] Remove no longer needed mappings change
PaperMC/Paper@e035fd7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@c215ce1 [ci skip] cleanup patch diff from last commit
This commit is contained in:
granny
2023-12-25 18:45:01 -08:00
parent 6aec125590
commit 10685bb957
24 changed files with 75 additions and 75 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 e5aa98430309eef04770fb68fd8314ac97fde167..cd8e6eaf4148f87e449e90b84a6c2aaa
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 16058e98dbe426791637682316cf0b11160d30f1..3349082af08600894fbca04533f9ab4a9bf2dfd9 100644
index 82a551caa75fbd50d75a5109cf7e897e829acf19..448394f5ff2d55b099549b49b77114483f0e58bd 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -282,6 +282,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index 16058e98dbe426791637682316cf0b11160d30f1..3349082af08600894fbca04533f9ab4a
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2876,5 +2879,13 @@ public class ServerPlayer extends Player {
@@ -2877,5 +2880,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);
}
}
@@ -103,7 +103,7 @@ index e46fcb5c8bf1047e3f330fd525166aee5f0b646b..61a34f3e49b21254984011bc470d72c8
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 aaf96399f937fbca30f1ce5d64be4af265a4ed29..61e3bce901bdbf111ffc06521b0e6d5369fce051 100644
index 65c31389566007a11934eff92162a4c410a25213..57734b187e3a66d0d244db2f7968256884957ff2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -182,6 +182,7 @@ public class PurpurConfig {