Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 11:30:06 +01:00
e4d10a6d67
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: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
46 Zeilen
1.7 KiB
Diff
46 Zeilen
1.7 KiB
Diff
From 9ab9b353c9a76455567a474ce06c2916d7789d75 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 8feb6698f..d51d2ec1d 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.25.1
|
|
|