summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2020-04-10 01:53:04 +0200
committerAlexander Harkness <me@bearbin.net>2020-04-10 01:53:04 +0200
commita780b3a4f546f693f385fabcc024e574a17a91fb (patch)
treef013e20715ab220d223ab201701d551522e91f89 /src/WorldStorage
parentAdd Zombie Villagers (diff)
downloadcuberite-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 '')
-rw-r--r--src/WorldStorage/NBTChunkSerializer.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index 138921264..19936add2 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -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");