diff options
| author | Alexander Harkness <me@bearbin.net> | 2020-04-10 01:53:04 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2020-04-10 01:53:04 +0200 |
| commit | a780b3a4f546f693f385fabcc024e574a17a91fb (patch) | |
| tree | f013e20715ab220d223ab201701d551522e91f89 /src/Mobs | |
| parent | Add Zombie Villagers (diff) | |
| download | cuberite-a780b3a4f546f693f385fabcc024e574a17a91fb.tar cuberite-a780b3a4f546f693f385fabcc024e574a17a91fb.tar.gz cuberite-a780b3a4f546f693f385fabcc024e574a17a91fb.tar.bz2 cuberite-a780b3a4f546f693f385fabcc024e574a17a91fb.tar.lz cuberite-a780b3a4f546f693f385fabcc024e574a17a91fb.tar.xz cuberite-a780b3a4f546f693f385fabcc024e574a17a91fb.tar.zst cuberite-a780b3a4f546f693f385fabcc024e574a17a91fb.zip | |
Diffstat (limited to 'src/Mobs')
| -rw-r--r-- | src/Mobs/MonsterTypes.h | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/src/Mobs/MonsterTypes.h b/src/Mobs/MonsterTypes.h index 6d3c57852..ea51f3539 100644 --- a/src/Mobs/MonsterTypes.h +++ b/src/Mobs/MonsterTypes.h @@ -11,7 +11,6 @@ enum eMonsterType { mtInvalidType = -1, -<<<<<<< HEAD mtBat, mtBlaze, mtCaveSpider, @@ -44,41 +43,7 @@ enum eMonsterType mtWolf, mtZombie, mtZombiePigman, -======= - mtBat = E_META_SPAWN_EGG_BAT, - mtBlaze = E_META_SPAWN_EGG_BLAZE, - mtCaveSpider = E_META_SPAWN_EGG_CAVE_SPIDER, - mtChicken = E_META_SPAWN_EGG_CHICKEN, - mtCow = E_META_SPAWN_EGG_COW, - mtCreeper = E_META_SPAWN_EGG_CREEPER, - mtEnderDragon = E_META_SPAWN_EGG_ENDER_DRAGON, - mtEnderman = E_META_SPAWN_EGG_ENDERMAN, - mtGhast = E_META_SPAWN_EGG_GHAST, - mtGiant = E_META_SPAWN_EGG_GIANT, - mtGuardian = E_META_SPAWN_EGG_GUARDIAN, - mtHorse = E_META_SPAWN_EGG_HORSE, - mtIronGolem = E_META_SPAWN_EGG_IRON_GOLEM, - mtMagmaCube = E_META_SPAWN_EGG_MAGMA_CUBE, - mtMooshroom = E_META_SPAWN_EGG_MOOSHROOM, - mtOcelot = E_META_SPAWN_EGG_OCELOT, - mtPig = E_META_SPAWN_EGG_PIG, - mtRabbit = E_META_SPAWN_EGG_RABBIT, - mtSheep = E_META_SPAWN_EGG_SHEEP, - mtSilverfish = E_META_SPAWN_EGG_SILVERFISH, - mtSkeleton = E_META_SPAWN_EGG_SKELETON, - mtSlime = E_META_SPAWN_EGG_SLIME, - mtSnowGolem = E_META_SPAWN_EGG_SNOW_GOLEM, - mtSpider = E_META_SPAWN_EGG_SPIDER, - mtSquid = E_META_SPAWN_EGG_SQUID, - mtVillager = E_META_SPAWN_EGG_VILLAGER, - mtWitch = E_META_SPAWN_EGG_WITCH, - mtWither = E_META_SPAWN_EGG_WITHER, - mtWolf = E_META_SPAWN_EGG_WOLF, - mtZombie = E_META_SPAWN_EGG_ZOMBIE, - mtZombiePigman = E_META_SPAWN_EGG_ZOMBIE_PIGMAN, - mtZombieVillager = E_META_SPAWN_EGG_ZOMBIE_VILLAGER, - mtMax = 120, // This is just a hotfix for https://forum.cuberite.org/thread-1616.html. Tolua is too bad to find the highest value, so this is needed. ->>>>>>> Add Zombie Villagers + mtZombieVillager, } ; // tolua_end |