diff options
| author | Mattes D <github@xoft.cz> | 2014-07-17 11:23:09 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-07-17 11:23:09 +0200 |
| commit | ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4 (patch) | |
| tree | e2a6e048422755b6a5b04c0fbe3afd0bfbf1c700 /src/BlockID.h | |
| parent | Merge pull request #1193 from mc-server/deathmessages (diff) | |
| parent | Fixed 3 MSVC warnings in SplashPotionEntity. (diff) | |
| download | cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.gz cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.bz2 cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.lz cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.xz cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.zst cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.zip | |
Diffstat (limited to 'src/BlockID.h')
| -rw-r--r-- | src/BlockID.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/BlockID.h b/src/BlockID.h index 272fd319d..ba05e9e1a 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -319,7 +319,8 @@ enum ENUM_ITEM_ID E_ITEM_GHAST_TEAR = 370, E_ITEM_GOLD_NUGGET = 371, E_ITEM_NETHER_WART = 372, - E_ITEM_POTIONS = 373, + E_ITEM_POTION = 373, + E_ITEM_POTIONS = 373, // OBSOLETE, use E_ITEM_POTION instead E_ITEM_GLASS_BOTTLE = 374, E_ITEM_SPIDER_EYE = 375, E_ITEM_FERMENTED_SPIDER_EYE = 376, @@ -811,6 +812,7 @@ enum eDamageType dtCactusContact, // Contact with a cactus block dtLavaContact, // Contact with a lava block dtPoisoning, // Having the poison effect + dtWithering, // Having the wither effect dtOnFire, // Being on fire dtFireContact, // Standing inside a fire block dtInVoid, // Falling into the Void (Y < 0) @@ -837,6 +839,7 @@ enum eDamageType dtCacti = dtCactusContact, dtLava = dtLavaContact, dtPoison = dtPoisoning, + dtWither = dtWithering, dtBurning = dtOnFire, dtInFire = dtFireContact, dtPlugin = dtAdmin, |