From 283a637a6611bc7aa0e98c5b219cfb5914d394e2 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Wed, 27 Oct 2021 18:36:29 +1100 Subject: [PATCH] SPIGOT-4590, SPIGOT-6769: Clarify DamageCause documentation By: Doc --- .../org/bukkit/event/entity/EntityDamageEvent.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java index 196e6d2ab5..07538e1b94 100644 --- a/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java @@ -260,9 +260,10 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable { public enum DamageCause { /** - * Damage caused when an entity contacts a block such as a Cactus. + * Damage caused when an entity contacts a block such as a Cactus, + * Dripstone (Stalagmite) or Berry Bush. *

- * Damage: 1 (Cactus) + * Damage: variable */ CONTACT, /** @@ -351,9 +352,12 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable { */ LIGHTNING, /** - * Damage caused by committing suicide using the command "/kill" + * Damage caused by committing suicide. *

- * Damage: 1000 + * Note: This is currently only used by plugins, default commands + * like /minecraft:kill use {@link #VOID} to damage players. + *

+ * Damage: variable */ SUICIDE, /**