diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-09 01:14:42 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-09 01:14:42 +0100 |
| commit | 9d1c9097e3a62f11cce94d1807c16a310eba6c2c (patch) | |
| tree | f186174dd8567c9f0d43969a19782d8fdb2fb2ed /src/BlockID.cpp | |
| parent | Merge branch 'master' into playerimprovements (diff) | |
| parent | Merge pull request #656 from mc-server/ReloadGroups (diff) | |
| download | cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.gz cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.bz2 cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.lz cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.xz cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.zst cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.zip | |
Diffstat (limited to 'src/BlockID.cpp')
| -rw-r--r-- | src/BlockID.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/BlockID.cpp b/src/BlockID.cpp index de56d4625..c38db0bfe 100644 --- a/src/BlockID.cpp +++ b/src/BlockID.cpp @@ -380,7 +380,7 @@ AString DamageTypeToString(eDamageType a_DamageType) case dtRangedAttack: return "dtRangedAttack"; case dtStarving: return "dtStarving"; case dtSuffocating: return "dtSuffocation"; - + case dtExplosion: return "dtExplosion"; } // Unknown damage type: @@ -426,6 +426,7 @@ eDamageType StringToDamageType(const AString & a_DamageTypeString) { dtInVoid, "dtInVoid"}, { dtPotionOfHarming, "dtPotionOfHarming"}, { dtAdmin, "dtAdmin"}, + { dtExplosion, "dtExplosion"}, // Common synonyms: { dtAttack, "dtPawnAttack"}, |