Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00: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@a622eba Fix beehives generating from using bonemeal (#9052)
PaperMC/Paper@fbf74ba Updated Upstream (CraftBukkit) (#9053)
This commit is contained in:
granny
2023-03-26 23:43:18 -07:00
parent 49d99462fa
commit 7e014a84b5
31 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0121-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 d15b29153d8112ed59ce38ab37142208551178b4..7a9b5f6665e910f12bcc9d3ade8534a93aa09dd9 100644
index ead34927019224e76063ac1a040dea78022fb36a..adceeb21805e207b0bc0cfa0035eefcb82029311 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -276,6 +276,7 @@ public class ServerPlayer extends Player {
@@ -277,6 +277,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 d15b29153d8112ed59ce38ab37142208551178b4..7a9b5f6665e910f12bcc9d3ade8534a9
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
@@ -515,6 +516,7 @@ public class ServerPlayer extends Player {
@@ -516,6 +517,7 @@ public class ServerPlayer extends Player {
}
}
@@ -61,7 +61,7 @@ index d15b29153d8112ed59ce38ab37142208551178b4..7a9b5f6665e910f12bcc9d3ade8534a9
}
@Override
@@ -581,6 +583,7 @@ public class ServerPlayer extends Player {
@@ -582,6 +584,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -69,7 +69,7 @@ index d15b29153d8112ed59ce38ab37142208551178b4..7a9b5f6665e910f12bcc9d3ade8534a9
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2674,5 +2677,13 @@ public class ServerPlayer extends Player {
@@ -2685,5 +2688,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}