flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Oops, remember to save your files!

Browse Source
This commit is contained in:
Alexander Harkness 2020-04-10 00:53:04 +01:00
parent 8438def87e
commit a780b3a4f5
No known key found for this signature in database
GPG Key ID: 5187245ADF160B76
2 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Mobs/MonsterTypes.h
View File

@ -11,7 +11,6 @@ enum eMonsterType
{ {
mtInvalidType = -1, mtInvalidType = -1,
<<<<<<< HEAD
mtBat, mtBat,
mtBlaze, mtBlaze,
mtCaveSpider, mtCaveSpider,
@ -44,41 +43,7 @@ enum eMonsterType
mtWolf, mtWolf,
mtZombie, mtZombie,
mtZombiePigman, mtZombiePigman,
======= mtZombieVillager,
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
} ; } ;
// tolua_end // tolua_end

6
src/WorldStorage/NBTChunkSerializer.cpp
View File

@ -738,17 +738,11 @@ public:
case mtVillager: EntityClass = "Villager"; break; case mtVillager: EntityClass = "Villager"; break;
case mtWitch: EntityClass = "Witch"; break; case mtWitch: EntityClass = "Witch"; break;
case mtWither: EntityClass = "WitherBoss"; break; case mtWither: EntityClass = "WitherBoss"; break;
<<<<<<< HEAD
case mtWitherSkeleton: EntityClass = "WitherSkeleton"; break; case mtWitherSkeleton: EntityClass = "WitherSkeleton"; break;
case mtWolf: EntityClass = "Wolf"; break; case mtWolf: EntityClass = "Wolf"; break;
case mtZombie: EntityClass = "Zombie"; break; case mtZombie: EntityClass = "Zombie"; break;
case mtZombiePigman: EntityClass = "PigZombie"; break; case mtZombiePigman: EntityClass = "PigZombie"; break;
=======
case mtWolf: EntityClass = "Wolf"; break;
case mtZombie: EntityClass = "Zombie"; break;
case mtZombiePigman: EntityClass = "PigZombie"; break;
case mtZombieVillager: EntityClass = "ZombieVillager"; break; case mtZombieVillager: EntityClass = "ZombieVillager"; break;
>>>>>>> Add Zombie Villagers
default: default:
{ {
ASSERT(!"Unhandled monster type"); ASSERT(!"Unhandled monster type");