Use CraftBukkit's damage API fix instead of our own
... here's hoping theirs works
This commit is contained in:
2
Bukkit
2
Bukkit
Submodule Bukkit updated: 07794f4def...f2854540c2
Submodule CraftBukkit updated: c3553415a1...dc0b6f5e82
@@ -1,53 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Zach Brown <1254957+zachbr@users.noreply.github.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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
||||||
@@ -0,0 +0,0 @@ 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;
|
|
||||||
@@ -0,0 +0,0 @@ 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) {
|
|
||||||
--
|
|
||||||
Reference in New Issue
Block a user