summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2013-11-13 21:13:35 +0100
committerAlexander Harkness <bearbin@gmail.com>2013-11-13 21:13:35 +0100
commit56c23305d53e4113cfbd41f39252a19ab67c1f23 (patch)
tree3b14b8a10822491eff2e919af5f82d2f4075f2dc
parentRemoved unnecessary format data. (diff)
downloadcuberite-56c23305d53e4113cfbd41f39252a19ab67c1f23.tar
cuberite-56c23305d53e4113cfbd41f39252a19ab67c1f23.tar.gz
cuberite-56c23305d53e4113cfbd41f39252a19ab67c1f23.tar.bz2
cuberite-56c23305d53e4113cfbd41f39252a19ab67c1f23.tar.lz
cuberite-56c23305d53e4113cfbd41f39252a19ab67c1f23.tar.xz
cuberite-56c23305d53e4113cfbd41f39252a19ab67c1f23.tar.zst
cuberite-56c23305d53e4113cfbd41f39252a19ab67c1f23.zip
Diffstat (limited to '')
-rw-r--r--source/BlockID.cpp23
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: