56 lines
2.6 KiB
Diff
56 lines
2.6 KiB
Diff
From d4704f5db1d3d651344b8c385b211722c54eae02 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <Zbob750@live.com>
|
|
Date: Tue, 8 Jul 2014 21:49:42 -0500
|
|
Subject: [PATCH] Revert Bukkit Damage API Behavior
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
index 67484dc..760cec5 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -967,6 +967,16 @@ public abstract class EntityLiving extends Entity {
|
|
// CraftBukkit start
|
|
protected boolean d(DamageSource damagesource, float f) { // void -> boolean
|
|
if (!this.isInvulnerable()) {
|
|
+ // PaperSpigot start - moved up from below to bring back old behavior
|
|
+ EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, f, 0, 0, 0, 0, 0, 0);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ f = (float) event.getDamage();
|
|
+ // PaperSpigot end
|
|
+
|
|
boolean human = this instanceof EntityHuman;
|
|
float originalDamage = f;
|
|
float preDamage = f;
|
|
@@ -1006,13 +1016,19 @@ public abstract class EntityLiving extends Entity {
|
|
f = Math.max(f - this.getAbsorptionHearts(), 0.0F);
|
|
float absorptionModifier = Math.max(f1 - f, 0.0F);
|
|
|
|
- EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, -hardHatModifier, -blockingModifier, -armorModifier, -resistanceModifier, -magicModifier, -absorptionModifier);
|
|
-
|
|
- if (event.isCancelled()) {
|
|
- return false;
|
|
+ // PaperSpigot start - Moved event call up
|
|
+ event.setDamage(DamageModifier.ARMOR, -armorModifier);
|
|
+ if (damagesource == DamageSource.FALLING_BLOCK || damagesource == DamageSource.ANVIL) {
|
|
+ event.setDamage(DamageModifier.HARD_HAT, -hardHatModifier);
|
|
}
|
|
|
|
- f = (float) event.getFinalDamage();
|
|
+ if (human) {
|
|
+ event.setDamage(DamageModifier.BLOCKING, -blockingModifier);
|
|
+ }
|
|
+ event.setDamage(DamageModifier.RESISTANCE, -resistanceModifier);
|
|
+ event.setDamage(DamageModifier.MAGIC, -magicModifier);
|
|
+ event.setDamage(DamageModifier.ABSORPTION, -absorptionModifier);
|
|
+ // PaperSpigot end
|
|
|
|
// Apply damage to helmet
|
|
if ((damagesource == DamageSource.ANVIL || damagesource == DamageSource.FALLING_BLOCK) && this.getEquipment(4) != null) {
|
|
--
|
|
1.9.1
|
|
|