mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
0976d52bbd
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fcSPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
From e7360254c9b8b35b93943d7608685f5c7ffd20e1 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Fri, 22 Apr 2016 01:43:11 -0500
|
|
Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
|
|
index 8feb6698..d51d2ec1 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
|
|
@@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
|
|
private boolean cancelled;
|
|
private double amount;
|
|
private final RegainReason regainReason;
|
|
+ private final boolean isFastRegen; // Paper
|
|
|
|
public EntityRegainHealthEvent(@NotNull final Entity entity, final double amount, @NotNull final RegainReason regainReason) {
|
|
+ // Paper start - Forward
|
|
+ this(entity, amount, regainReason, false);
|
|
+ }
|
|
+
|
|
+ public EntityRegainHealthEvent(@NotNull final Entity entity, final double amount, @NotNull final RegainReason regainReason, boolean isFastRegen) {
|
|
+ // Paper end
|
|
super(entity);
|
|
this.amount = amount;
|
|
this.regainReason = regainReason;
|
|
+ this.isFastRegen = isFastRegen; // Paper
|
|
+ }
|
|
+
|
|
+ // Paper start - Add getter for isFastRegen
|
|
+ /**
|
|
+ * Is this event a result of the fast regeneration mechanic
|
|
+ *
|
|
+ * @return Whether the event is the result of a fast regeneration mechanic
|
|
+ */
|
|
+ public boolean isFastRegen() {
|
|
+ return isFastRegen;
|
|
}
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Gets the amount of regained health
|
|
--
|
|
2.21.0
|
|
|