mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 09:23:42 +01:00
36f34f01c0
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 Bukkit Changes: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 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 8feb6698f9630f099be99e52d1149cd6bc615197..d51d2ec1d04d9ea8a25a70d0d856f2355ebfcb4a 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
|