OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 20:50:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Set health before death event

Browse source
This commit is contained in:
kashike 2016-03-19 10:12:30 -07:00 committed by Zach Brown
parent 3b15da52db
commit 918e177370
1 changed files with 50 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Spigot-Server-Patches/0098-Set-health-before-death-event.patch Normal file
View file

@ -0,0 +1,50 @@
From 9d6816715ea3547ca50e0a60b18721a338f58329 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 19 Jul 2015 16:51:38 -0400
Subject: [PATCH] Set health before death event
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index de5d945..ab86ab6 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -175,4 +175,9 @@ public class PaperConfig {
private static void loadPermsBeforePlugins() {
loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
}
+
+ public static boolean setHealthBeforeDeathEvent = false;
+ public static void healthDeath() {
+ setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 693d5cb..ef522e7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -98,11 +98,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+ (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
}
+ // Paper start
+ if (com.destroystokyo.paper.PaperConfig.setHealthBeforeDeathEvent) {
+ this.getHandle().setHealth((float) health);
+ }
+ // Paper end
+
if (entity instanceof EntityPlayer && health == 0) {
((EntityPlayer) entity).die(DamageSource.GENERIC);
}
- getHandle().setHealth((float) health);
+ // Paper start - wrap, see above
+ if (!com.destroystokyo.paper.PaperConfig.setHealthBeforeDeathEvent) {
+ getHandle().setHealth((float) health);
+ }
+ // Paper end
}
public double getMaxHealth() {
--
2.7.2