mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 12:41:50 +01:00
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
|
|
Date: Wed, 13 Jul 2022 15:29:53 +0200
|
|
Subject: [PATCH] Allow trident custom damage
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Trident.java b/src/main/java/org/bukkit/entity/Trident.java
|
|
index 02584eced96944a551140f8150c65a7c0f4bb55e..d21df39ceef657575f3c2e9070bf6d2671978c7a 100644
|
|
--- a/src/main/java/org/bukkit/entity/Trident.java
|
|
+++ b/src/main/java/org/bukkit/entity/Trident.java
|
|
@@ -57,5 +57,23 @@ public interface Trident extends AbstractArrow, ThrowableProjectile {
|
|
* @param hasDealtDamage has dealt damage or hit the floor
|
|
*/
|
|
void setHasDealtDamage(boolean hasDealtDamage);
|
|
+
|
|
+ /**
|
|
+ * Sets the base amount of damage this trident will do.
|
|
+ *
|
|
+ * @param damage new damage amount
|
|
+ */
|
|
+ void setDamage(double damage);
|
|
+
|
|
+ /**
|
|
+ * Gets the base amount of damage this trident will do.
|
|
+ *
|
|
+ * Defaults to 8.0 for a normal trident with
|
|
+ * <code>0.5 * (1 + power level)</code> added for trident fired from
|
|
+ * damage enchanted bows.
|
|
+ *
|
|
+ * @return base damage amount
|
|
+ */
|
|
+ double getDamage();
|
|
}
|
|
// Paper end
|