diff options
| author | mgueydan <gueydan.mathieuÃ@gmail.com> | 2013-09-22 14:29:33 +0200 |
|---|---|---|
| committer | mgueydan <gueydan.mathieuÃ@gmail.com> | 2013-09-22 14:29:33 +0200 |
| commit | ac4cb65b8d8443c6bb7835934f4b74dc2bdb820d (patch) | |
| tree | 6f869625bd6a4509e37231194d777fc4e9df7d5e /source/BlockID.h | |
| parent | Inside cMonster::getMobFamily() : replacing Polymorphism by Map, in order to remove redundancy (diff) | |
| parent | Merged branch 'Projectiles'. (diff) | |
| download | cuberite-ac4cb65b8d8443c6bb7835934f4b74dc2bdb820d.tar cuberite-ac4cb65b8d8443c6bb7835934f4b74dc2bdb820d.tar.gz cuberite-ac4cb65b8d8443c6bb7835934f4b74dc2bdb820d.tar.bz2 cuberite-ac4cb65b8d8443c6bb7835934f4b74dc2bdb820d.tar.lz cuberite-ac4cb65b8d8443c6bb7835934f4b74dc2bdb820d.tar.xz cuberite-ac4cb65b8d8443c6bb7835934f4b74dc2bdb820d.tar.zst cuberite-ac4cb65b8d8443c6bb7835934f4b74dc2bdb820d.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, |