From 42ea85786a44b519eb79f08a350020ed693d2e0e Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Fri, 30 Aug 2013 23:48:03 +0200 Subject: Thrown ender pearls now teleport and hurt. --- source/BlockID.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source/BlockID.h') diff --git a/source/BlockID.h b/source/BlockID.h index de8335e85..b7e9f3779 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -659,6 +659,7 @@ enum eDamageType dtFireContact, // Standing inside a fire block dtInVoid, // Falling into the Void (Y < 0) dtPotionOfHarming, + dtEnderPearl, // Thrown an ender pearl, teleported by it dtAdmin, // Damage applied by an admin command // Some common synonyms: -- cgit v1.2.3 From 0dec48d4969bc1973b228c09f6d38d4d63a0a005 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Sun, 1 Sep 2013 20:06:49 +0200 Subject: Added dtRangedAttack, fixed faulty StringTODamageType() --- source/BlockID.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/BlockID.h') diff --git a/source/BlockID.h b/source/BlockID.h index b7e9f3779..00aeff4d6 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -647,6 +647,7 @@ enum eDamageType { // Canonical names for the types (as documented in the plugin wiki): dtAttack, // Being attacked by a mob + dtRangedAttack, // Being attacked by a projectile, possibly from a mob dtLightning, // Hit by a lightning strike dtFalling, // Falling down; dealt when hitting the ground dtDrowning, // Drowning in water / lava @@ -667,6 +668,9 @@ enum eDamageType dtEntityAttack = dtAttack, dtMob = dtAttack, dtMobAttack = dtAttack, + dtArrowAttack = dtRangedAttack, + dtArrow = dtRangedAttack, + dtProjectile = dtRangedAttack, dtFall = dtFalling, dtDrown = dtDrowning, dtSuffocation = dtSuffocating, -- cgit v1.2.3