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
2 changed files with 1 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WorldStorage/NBTChunkSerializer.cpp
View File

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