diff --git a/gradle.properties b/gradle.properties index eb05fe283..683dba406 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=com.lokamc.slice version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=b4e3b3d1dd447bac4cbf478595c1ec320bc6dd4b +paperRef=72e87abc2db813ecd74a323c33a7b9c79b0c67b9 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0019-Add-timeDamaged-to-EntityDamageEvent.patch b/patches/api/0019-Add-timeDamaged-to-EntityDamageEvent.patch new file mode 100644 index 000000000..a8750cd42 --- /dev/null +++ b/patches/api/0019-Add-timeDamaged-to-EntityDamageEvent.patch @@ -0,0 +1,41 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cryptite +Date: Sun, 10 Sep 2023 07:41:26 -0500 +Subject: [PATCH] Add timeDamaged to EntityDamageEvent + + +diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java +index 4773f537dec20d6ebd82e4b145a1cdea0077fe90..f7a6346bc7eecc57fa7d69c801afa15230496f3c 100644 +--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java ++++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java +@@ -27,6 +27,7 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable { + private final Map originals; + private boolean cancelled; + private final DamageCause cause; ++ private long timeDamaged = System.currentTimeMillis(); // Slice + + public EntityDamageEvent(@NotNull final Entity damagee, @NotNull final DamageCause cause, final double damage) { + this(damagee, cause, new EnumMap(ImmutableMap.of(DamageModifier.BASE, damage)), new EnumMap>(ImmutableMap.of(DamageModifier.BASE, ZERO))); +@@ -193,6 +194,22 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable { + return cause; + } + ++ // Slice start ++ /** ++ * @return Get the time the damage event happened. ++ */ ++ public long getTimeDamaged() { ++ return timeDamaged; ++ } ++ ++ /** ++ * @param timeDamaged Set the time the damage event happened, if you so choose. ++ */ ++ public void setTimeDamaged(long timeDamaged) { ++ this.timeDamaged = timeDamaged; ++ } ++ // Slice end ++ + @NotNull + @Override + public HandlerList getHandlers() {