aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0014-Timings-v2.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2023-06-16 03:28:31 -0700
committerGitHub <[email protected]>2023-06-16 11:28:31 +0100
commit41e6f20420ec09df209745fb8bd89dd2eb9c585f (patch)
treed3d3b7f3e6b52eb411f1641633c0bdff1de571ec /patches/server/0014-Timings-v2.patch
parentf7b386ddc77e5ed2ebed044cc7c8ad0bcd842b55 (diff)
downloadPaper-41e6f20420ec09df209745fb8bd89dd2eb9c585f.tar.gz
Paper-41e6f20420ec09df209745fb8bd89dd2eb9c585f.zip
Updated Upstream (Bukkit/CraftBukkit) (#9342)
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: fdff0cd4 PR-869: Add Enderman#teleport and Enderman#teleportTowards dfd86ee7 Improve sendSignChange and related documentation beced2b2 PR-867: Add Player#sendBlockUpdate to send tile entity updates CraftBukkit Changes: ad6d0cffb SPIGOT-7394: Fix another issue with sendSignChange 66c5ce4c7 SPIGOT-7391: Preserve vanilla sign json where not modified by event ae3824f94 PR-1204: Add Enderman#teleport and Enderman#teleportTowards 5863a2eae Fix sendSignChange not working 4a7eadc97 PR-1201: Add Player#sendBlockUpdate to send tile entity updates 789324e30 Work around issue placing decorated pots
Diffstat (limited to 'patches/server/0014-Timings-v2.patch')
-rw-r--r--patches/server/0014-Timings-v2.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch
index 26fed824bc..c2cd88b86d 100644
--- a/patches/server/0014-Timings-v2.patch
+++ b/patches/server/0014-Timings-v2.patch
@@ -1846,10 +1846,10 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000
- }
-}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e37f69880c4b439245d7edb4c35418ed3da27a5f..3c6617170c618800940d5826c7e73a3ac7f32e19 100644
+index 41ec9e0adb2a17f8cab4fb1f1735d8b2679f92d0..6812237223f8b31e19476cf320192214994c032c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2470,6 +2470,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2486,6 +2486,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
CraftPlayer.this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(components, position == net.md_5.bungee.api.ChatMessageType.ACTION_BAR));
}