mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-06 18:50:51 +01:00
5730a94208
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: 2b4582fb SPIGOT-5916: getLastColors does not work with the rgb colors CraftBukkit Changes: f7707086d SPIGOT-7299: Fix indirect/anvil damage events and minor improvements
38 lines
2 KiB
Diff
38 lines
2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: TheFruxz <cedricspitzer@outlook.de>
|
|
Date: Sat, 2 Apr 2022 13:03:39 +0200
|
|
Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index 607415c6dae4f107406365a97925d1cb89c630d8..13d3676f9a394ba10f772b89b30dde55c3f4a133 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -638,7 +638,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
/**
|
|
* Send block damage. This fakes block break progress for a user at a
|
|
* certain location. This will not actually change the block's break
|
|
- * progress in any way.
|
|
+ * progress in any way. The destroying entity will be this player.
|
|
*
|
|
* @param loc the location of the damaged block
|
|
* @param progress the progress from 0.0 - 1.0 where 0 is no damage and
|
|
@@ -647,6 +647,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
public void sendBlockDamage(@NotNull Location loc, float progress);
|
|
|
|
// Paper start
|
|
+
|
|
+ /**
|
|
+ * Send block damage. This fakes block break progress for a user at a certain location.
|
|
+ * This will not actually change the block's break progress in any way.
|
|
+ * The destroying entity is defined via the destroyerIdentity parameter.
|
|
+ *
|
|
+ * @param loc the location of the damaged block
|
|
+ * @param progress the progress from 0.0 - 1.0 where 0 is no damage and 1.0 is the most damaged
|
|
+ * @param destroyerIdentity the entity id of the destroyer
|
|
+ */
|
|
+ public void sendBlockDamage(@NotNull Location loc, float progress, int destroyerIdentity);
|
|
+
|
|
/**
|
|
* Send multiple block changes. This fakes a multi block change packet for each
|
|
* chunk section that a block change occurs. This will not actually change the world in any way.
|