Spigot / Bukkit / 237bb37bb31

Commits

Doc authored and md_5 committed 237bb37bb31 04 May 2024

SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent

src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java

Modified

-1
+package org.bukkit.event.entity;
-2
-3
+import com.google.common.base.Function;
-4
+import java.util.Map;
-5
+import org.bukkit.block.Block;
-+
+import org.bukkit.block.BlockState;
-7
+import org.bukkit.damage.DamageSource;
-8
+import org.bukkit.damage.DamageType;
-9
+import org.bukkit.entity.Entity;
-10
+import org.jetbrains.annotations.NotNull;
-11
+import org.jetbrains.annotations.Nullable;
-12
-13
+/**
-14
+ * Called when an entity is damaged by a block
-15
+ */
-16
+public class EntityDamageByBlockEvent extends EntityDamageEvent {
-17
+    private final Block damager;
-+
+    private final BlockState damagerState;
-19
-20
+    @Deprecated(forRemoval = true)
-21
+    public EntityDamageByBlockEvent(@Nullable final Block damager, @NotNull final Entity damagee, @NotNull final DamageCause cause, final double damage) {
--
+        this(damager, damagee, cause, (damager != null) ? DamageSource.builder(DamageType.GENERIC).withDamageLocation(damager.getLocation()).build() : DamageSource.builder(DamageType.GENERIC).build(), damage);
-+
+        this(damager, (damager != null) ? damager.getState() : null, damagee, cause, (damager != null) ? DamageSource.builder(DamageType.GENERIC).withDamageLocation(damager.getLocation()).build() : DamageSource.builder(DamageType.GENERIC).build(), damage);
-23
+    }
-24
--
+    public EntityDamageByBlockEvent(@Nullable final Block damager, @NotNull final Entity damagee, @NotNull final DamageCause cause, @NotNull final DamageSource damageSource, final double damage) {
-+
+    public EntityDamageByBlockEvent(@Nullable final Block damager, @Nullable final BlockState damagerState, @NotNull final Entity damagee, @NotNull final DamageCause cause, @NotNull final DamageSource damageSource, final double damage) {
-26
+        super(damagee, cause, damageSource, damage);
-27
+        this.damager = damager;
-+
+        this.damagerState = damagerState;
-29
+    }
-30
-31
+    @Deprecated(forRemoval = true)
-32
+    public EntityDamageByBlockEvent(@Nullable final Block damager, @NotNull final Entity damagee, @NotNull final DamageCause cause, @NotNull final Map<DamageModifier, Double> modifiers, @NotNull final Map<DamageModifier, ? extends Function<? super Double, Double>> modifierFunctions) {
--
+        this(damager, damagee, cause, (damager != null) ? DamageSource.builder(DamageType.GENERIC).withDamageLocation(damager.getLocation()).build() : DamageSource.builder(DamageType.GENERIC).build(), modifiers, modifierFunctions);
-+
+        this(damager, (damager != null) ? damager.getState() : null, damagee, cause, (damager != null) ? DamageSource.builder(DamageType.GENERIC).withDamageLocation(damager.getLocation()).build() : DamageSource.builder(DamageType.GENERIC).build(), modifiers, modifierFunctions);
-34
+    }
-35
--
+    public EntityDamageByBlockEvent(@Nullable final Block damager, @NotNull final Entity damagee, @NotNull final DamageCause cause, @NotNull final DamageSource damageSource, @NotNull final Map<DamageModifier, Double> modifiers, @NotNull final Map<DamageModifier, ? extends Function<? super Double, Double>> modifierFunctions) {
-+
+    public EntityDamageByBlockEvent(@Nullable final Block damager, @Nullable final BlockState damagerState, @NotNull final Entity damagee, @NotNull final DamageCause cause, @NotNull final DamageSource damageSource, @NotNull final Map<DamageModifier, Double> modifiers, @NotNull final Map<DamageModifier, ? extends Function<? super Double, Double>> modifierFunctions) {
-37
+        super(damagee, cause, damageSource, modifiers, modifierFunctions);
-38
+        this.damager = damager;
-+
+        this.damagerState = damagerState;
-40
+    }
-41
-42
+    /**
-43
+     * Returns the block that damaged the player.
-44
+     *
-45
+     * @return Block that damaged the player
-46
+     */
-47
+    @Nullable
-48
+    public Block getDamager() {
-49
+        return damager;
-50
+    }
-+
-+
+    /**
-+
+     * Returns the captured BlockState of the block that damaged the player.
-+
+     *
-+
+     * @return the block state
-+
+     */
-+
+    @Nullable
-+
+    public BlockState getDamagerBlockState() {
-+
+        return damagerState;
-+
+    }
-61
+}

Bukkit

Commits

Jira Issues

Add shortcut