diff options
| author | Nassim Jahnke <[email protected]> | 2022-10-02 09:56:36 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-10-02 09:56:36 +0200 |
| commit | 928bcc8d3a058221146cea1de7d42d7e178e78f2 (patch) | |
| tree | fdb518a8812097f983c41d36ea693baf5c208554 /patches/server/0906-Add-custom-destroyerIdentity-to-sendBlockDamage.patch | |
| parent | ec3cfa9b7f147cf097692144f665893748fadc3b (diff) | |
| download | Paper-928bcc8d3a058221146cea1de7d42d7e178e78f2.tar.gz Paper-928bcc8d3a058221146cea1de7d42d7e178e78f2.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#8430)
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:
09943450 Update SnakeYAML version
5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc
6f82b381 PR-788: Add getHand() to all relevant events
CraftBukkit Changes:
aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe
5329dd6fd PR-1107: Add getHand() to all relevant events
93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
Diffstat (limited to 'patches/server/0906-Add-custom-destroyerIdentity-to-sendBlockDamage.patch')
| -rw-r--r-- | patches/server/0906-Add-custom-destroyerIdentity-to-sendBlockDamage.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/patches/server/0906-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0906-Add-custom-destroyerIdentity-to-sendBlockDamage.patch deleted file mode 100644 index 6a427b822d..0000000000 --- a/patches/server/0906-Add-custom-destroyerIdentity-to-sendBlockDamage.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: TheFruxz <[email protected]> -Date: Sat, 26 Mar 2022 18:41:36 +0100 -Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f2e5164b0651963cb26e4d776ec5c6e30647790f..a508619e6855ee0b96a9bf61526b1b88abf0e732 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1008,13 +1008,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - - @Override - public void sendBlockDamage(Location loc, float progress) { -+ // Paper start - customBlockDamage identity -+ sendBlockDamage(loc, progress, this.getHandle().getId()); -+ } -+ -+ @Override -+ public void sendBlockDamage(Location loc, float progress, int destroyerIdentity) { -+ // Paper end - customBlockDamage identity - Preconditions.checkArgument(loc != null, "loc must not be null"); - Preconditions.checkArgument(progress >= 0.0 && progress <= 1.0, "progress must be between 0.0 and 1.0 (inclusive)"); - - if (this.getHandle().connection == null) return; - - int stage = (int) (9 * progress); // There are 0 - 9 damage states -- ClientboundBlockDestructionPacket packet = new ClientboundBlockDestructionPacket(this.getHandle().getId(), new BlockPos(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()), stage); -+ ClientboundBlockDestructionPacket packet = new ClientboundBlockDestructionPacket(destroyerIdentity, new BlockPos(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()), stage); // Paper - customBlockDamage identity - this.getHandle().connection.send(packet); - } - |