diff options
| author | madmaxoft <github@xoft.cz> | 2013-09-07 22:06:30 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-09-07 22:06:30 +0200 |
| commit | d31142811db9073b7b01b834ca3bf82f6bceb4a9 (patch) | |
| tree | 9988b872e675a082253126b9ff292070e913b1cd /source/BlockID.h | |
| parent | Fixed a missing initialization in cMonster. (diff) | |
| parent | Added a (disabled) block logging to projectile path-tracing. (diff) | |
| download | cuberite-d31142811db9073b7b01b834ca3bf82f6bceb4a9.tar cuberite-d31142811db9073b7b01b834ca3bf82f6bceb4a9.tar.gz cuberite-d31142811db9073b7b01b834ca3bf82f6bceb4a9.tar.bz2 cuberite-d31142811db9073b7b01b834ca3bf82f6bceb4a9.tar.lz cuberite-d31142811db9073b7b01b834ca3bf82f6bceb4a9.tar.xz cuberite-d31142811db9073b7b01b834ca3bf82f6bceb4a9.tar.zst cuberite-d31142811db9073b7b01b834ca3bf82f6bceb4a9.zip | |
Diffstat (limited to 'source/BlockID.h')
| -rw-r--r-- | source/BlockID.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/BlockID.h b/source/BlockID.h index 40da3c651..cd3bd78c4 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -659,6 +659,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 @@ -671,6 +672,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: @@ -678,6 +680,9 @@ enum eDamageType dtEntityAttack = dtAttack, dtMob = dtAttack, dtMobAttack = dtAttack, + dtArrowAttack = dtRangedAttack, + dtArrow = dtRangedAttack, + dtProjectile = dtRangedAttack, dtFall = dtFalling, dtDrown = dtDrowning, dtSuffocation = dtSuffocating, |