mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
2f92d4e00e
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: 01bb6ba7 PR-936: Add new PersistentDataContainer methods and clean up docs bc145b90 PR-940: Create registry for banner pattern and cat type CraftBukkit Changes: cb2ea54de SPIGOT-7440, PR-1292: Fire EntityTeleportEvent for end gateways 4fea66e44 PR-1299: Add new PersistentDataContainer methods and clean up docs b483a20db PR-1303: Create registry for banner pattern and cat type 4642dd526 SPIGOT-7535: Fix maps not having an ID and also call MapInitializeEvent in more places
35 lines
1.2 KiB
Diff
35 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
|