From c26d6b679b60bcc2d0593c310fc2c94891f1fa8c Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Mon, 30 Jul 2018 09:20:53 +1000 Subject: [PATCH] SPIGOT-4187: Remove deprecation on some EntityDamageEvent constructors By: md_5 --- .../java/org/bukkit/event/entity/EntityDamageByBlockEvent.java | 1 - .../java/org/bukkit/event/entity/EntityDamageByEntityEvent.java | 1 - .../src/main/java/org/bukkit/event/entity/EntityDamageEvent.java | 1 - 3 files changed, 3 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java index 31c6a01201..0afc9d4349 100644 --- a/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java @@ -12,7 +12,6 @@ import org.bukkit.entity.Entity; public class EntityDamageByBlockEvent extends EntityDamageEvent { private final Block damager; - @Deprecated public EntityDamageByBlockEvent(final Block damager, final Entity damagee, final DamageCause cause, final double damage) { super(damagee, cause, damage); this.damager = damager; diff --git a/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java index f121786adf..83a6bebc1a 100644 --- a/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java @@ -11,7 +11,6 @@ import org.bukkit.entity.Entity; public class EntityDamageByEntityEvent extends EntityDamageEvent { private final Entity damager; - @Deprecated public EntityDamageByEntityEvent(final Entity damager, final Entity damagee, final DamageCause cause, final double damage) { super(damagee, cause, damage); this.damager = damager; 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 7591a4afce..b915258828 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 @@ -28,7 +28,6 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable { private boolean cancelled; private final DamageCause cause; - @Deprecated public EntityDamageEvent(final Entity damagee, final DamageCause cause, final double damage) { this(damagee, cause, new EnumMap(ImmutableMap.of(DamageModifier.BASE, damage)), new EnumMap>(ImmutableMap.of(DamageModifier.BASE, ZERO))); }