Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update upstream

Browse Source
This commit is contained in:
Cryptite
2024-02-24 08:21:47 -06:00
parent a3e66a0818
commit fc0a57dbe5
25 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0018-Add-timeDamaged-to-EntityDamageEvent.patch
View File

@@ -5,18 +5,18 @@ 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 3b20000d9ac3e29fe3bc5093e6635377bee88dbd..0f9e2dfa5d2e60962e58291af58cbedb0525e60d 100644
index 446b3ffd5caca5344be1c250475679834cd0d4a2..f2beba90acfd251817eb218c35dcf58309d808b1 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
@@ -29,6 +29,7 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
@@ -30,6 +30,7 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
private boolean cancelled;
private final DamageCause cause;
private final DamageSource damageSource;
+ private long timeDamaged = System.currentTimeMillis(); // Slice
public EntityDamageEvent(@NotNull final Entity damagee, @NotNull final DamageCause cause, @NotNull final DamageSource damageSource, final double damage) {
this(damagee, cause, damageSource, new EnumMap<DamageModifier, Double>(ImmutableMap.of(DamageModifier.BASE, damage)), new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, ZERO)));
@@ -210,6 +211,22 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
@Deprecated(forRemoval = true)
public EntityDamageEvent(@NotNull final Entity damagee, @NotNull final DamageCause cause, final double damage) {
@@ -221,6 +222,22 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
return damageSource;
}