diff options
author | Mattes D <github@xoft.cz> | 2013-11-17 23:26:53 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2013-11-17 23:26:53 +0100 |
commit | 5277360098a4e7818f6fbaa0e0ead3f0dce7adac (patch) | |
tree | 9d087dab5c1c6e04ce76b801519356557b9086f9 /source/BlockID.cpp | |
parent | Merge pull request #353 from marmot21/playerxp (diff) | |
parent | And another... (diff) | |
download | cuberite-5277360098a4e7818f6fbaa0e0ead3f0dce7adac.tar cuberite-5277360098a4e7818f6fbaa0e0ead3f0dce7adac.tar.gz cuberite-5277360098a4e7818f6fbaa0e0ead3f0dce7adac.tar.bz2 cuberite-5277360098a4e7818f6fbaa0e0ead3f0dce7adac.tar.lz cuberite-5277360098a4e7818f6fbaa0e0ead3f0dce7adac.tar.xz cuberite-5277360098a4e7818f6fbaa0e0ead3f0dce7adac.tar.zst cuberite-5277360098a4e7818f6fbaa0e0ead3f0dce7adac.zip |
Diffstat (limited to 'source/BlockID.cpp')
-rw-r--r-- | source/BlockID.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/source/BlockID.cpp b/source/BlockID.cpp index f8949577e..4467d7e82 100644 --- a/source/BlockID.cpp +++ b/source/BlockID.cpp @@ -461,23 +461,26 @@ eDimension StringToDimension(const AString & a_DimensionString) /// Translates damage type constant to a string representation (built-in). AString DamageTypeToString(eDamageType a_DamageType) { + // Make sure to keep this alpha-sorted. switch (a_DamageType) { + case dtAdmin: return "dtAdmin"; case dtAttack: return "dtAttack"; - case dtRangedAttack: return "dtRangedAttack"; - case dtLightning: return "dtLightning"; - case dtFalling: return "dtFalling"; - case dtDrowning: return "dtDrowning"; - case dtSuffocating: return "dtSuffocation"; - case dtStarving: return "dtStarving"; case dtCactusContact: return "dtCactusContact"; - case dtLavaContact: return "dtLavaContact"; - case dtPoisoning: return "dtPoisoning"; - case dtOnFire: return "dtOnFire"; + case dtDrowning: return "dtDrowning"; + case dtEnderPearl: return "dtEnderPearl"; + case dtFalling: return "dtFalling"; case dtFireContact: return "dtFireContact"; case dtInVoid: return "dtInVoid"; + case dtLavaContact: return "dtLavaContact"; + case dtLightning: return "dtLightning"; + case dtOnFire: return "dtOnFire"; + case dtPoisoning: return "dtPoisoning"; case dtPotionOfHarming: return "dtPotionOfHarming"; - case dtAdmin: return "dtAdmin"; + case dtRangedAttack: return "dtRangedAttack"; + case dtStarving: return "dtStarving"; + case dtSuffocating: return "dtSuffocation"; + } // Unknown damage type: |