aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0122-String-based-Action-Bar-API.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2023-04-14 00:52:42 +0100
committerShane Freeder <[email protected]>2023-04-14 00:52:42 +0100
commit8d040fad9b4ddcc49a7b70c15b80b63c479eac95 (patch)
treef3d8f022d4f3650ca697f4c1f37346da711a6e6a /patches/server/0122-String-based-Action-Bar-API.patch
parentbd35d605e843b58c7c07c5508a5ef463d385575d (diff)
downloadPaper-8d040fad9b4ddcc49a7b70c15b80b63c479eac95.tar.gz
Paper-8d040fad9b4ddcc49a7b70c15b80b63c479eac95.zip
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 465c4964 PR-843: Add damage methods to FallingBlock 46ba7c9f SPIGOT-7335: Fix typo in TextDisplay#TextAlignment enum name CraftBukkit Changes: 818582f40 PR-1169: Add damage methods to FallingBlock 15a3eac66 SPIGOT-7335: Fix typo in TextDisplay#TextAlignment enum name f01fb4979 SPIGOT-7336: Fix typo in internal method name
Diffstat (limited to 'patches/server/0122-String-based-Action-Bar-API.patch')
-rw-r--r--patches/server/0122-String-based-Action-Bar-API.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0122-String-based-Action-Bar-API.patch b/patches/server/0122-String-based-Action-Bar-API.patch
index 757358bbb2..b17ec6dcfc 100644
--- a/patches/server/0122-String-based-Action-Bar-API.patch
+++ b/patches/server/0122-String-based-Action-Bar-API.patch
@@ -26,10 +26,10 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad
// Paper end
buf.writeComponent(this.text);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 532b62d9cbfd9e7586b4df84fb0f1598a5e19e02..9fab9903b8902aa5bfa6d5224de7f36750ee40b7 100644
+index c7bc16d568199226885e4cd39c6835feb30bd532..6a12f14f7433ee13605f8dd8b7e0e8d127b915bd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -360,6 +360,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -359,6 +359,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// Paper start