summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2020-04-10 02:01:07 +0200
committerAlexander Harkness <me@bearbin.net>2020-04-10 02:01:07 +0200
commit4b3043f627cd527b66f9b71be45be3188c3b0439 (patch)
treefe90285e4ba517acfe6ccec255d5d9076da1e5ca
parentOops, remember to save your files! (diff)
downloadcuberite-4b3043f627cd527b66f9b71be45be3188c3b0439.tar
cuberite-4b3043f627cd527b66f9b71be45be3188c3b0439.tar.gz
cuberite-4b3043f627cd527b66f9b71be45be3188c3b0439.tar.bz2
cuberite-4b3043f627cd527b66f9b71be45be3188c3b0439.tar.lz
cuberite-4b3043f627cd527b66f9b71be45be3188c3b0439.tar.xz
cuberite-4b3043f627cd527b66f9b71be45be3188c3b0439.tar.zst
cuberite-4b3043f627cd527b66f9b71be45be3188c3b0439.zip
Diffstat (limited to '')
-rw-r--r--src/Mobs/Monster.cpp2
-rw-r--r--src/Protocol/Protocol_1_11.cpp1
-rw-r--r--src/Protocol/Protocol_1_13.cpp1
-rw-r--r--src/Protocol/Protocol_1_8.cpp1
-rw-r--r--src/Protocol/Protocol_1_9.cpp1
5 files changed, 5 insertions, 1 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index d20afa589..3cb1b00e8 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -1226,7 +1226,7 @@ std::unique_ptr<cMonster> cMonster::NewMonsterFromType(eMonsterType a_MobType)
case mtWither: return cpp14::make_unique<cWither>();
case mtWitherSkeleton: return cpp14::make_unique<cWitherSkeleton>();
case mtWolf: return cpp14::make_unique<cWolf>();
- case mtZombie: return cpp14::make_unique<cZombie>(false); // TODO: Infected zombie parameter
+ case mtZombie: return cpp14::make_unique<cZombie>();
case mtZombiePigman: return cpp14::make_unique<cZombiePigman>();
default:
{
diff --git a/src/Protocol/Protocol_1_11.cpp b/src/Protocol/Protocol_1_11.cpp
index 7e46fa332..7ce4db539 100644
--- a/src/Protocol/Protocol_1_11.cpp
+++ b/src/Protocol/Protocol_1_11.cpp
@@ -577,6 +577,7 @@ UInt32 cProtocol_1_11_0::GetProtocolMobType(eMonsterType a_MobType)
case mtWolf: return 95;
case mtZombie: return 54;
case mtZombiePigman: return 57;
+ case mtZombieVillager: return 27;
}
UNREACHABLE("Unsupported mob type");
}
diff --git a/src/Protocol/Protocol_1_13.cpp b/src/Protocol/Protocol_1_13.cpp
index 70375795f..c9482855d 100644
--- a/src/Protocol/Protocol_1_13.cpp
+++ b/src/Protocol/Protocol_1_13.cpp
@@ -434,6 +434,7 @@ UInt32 cProtocol_1_13::GetProtocolMobType(eMonsterType a_MobType)
case mtWolf: return 86;
case mtZombie: return 87;
case mtZombiePigman: return 53;
+ case mtZombieVillager: return 27;
}
UNREACHABLE("Unsupported mob type");
}
diff --git a/src/Protocol/Protocol_1_8.cpp b/src/Protocol/Protocol_1_8.cpp
index a516ec891..c8883544d 100644
--- a/src/Protocol/Protocol_1_8.cpp
+++ b/src/Protocol/Protocol_1_8.cpp
@@ -1885,6 +1885,7 @@ UInt32 cProtocol_1_8_0::GetProtocolMobType(eMonsterType a_MobType)
case mtWolf: return 95;
case mtZombie: return 54;
case mtZombiePigman: return 57;
+ case mtZombieVillager: return 27;
}
UNREACHABLE("Unsupported mob type");
}
diff --git a/src/Protocol/Protocol_1_9.cpp b/src/Protocol/Protocol_1_9.cpp
index e33b65b69..1ff28e1ea 100644
--- a/src/Protocol/Protocol_1_9.cpp
+++ b/src/Protocol/Protocol_1_9.cpp
@@ -1941,6 +1941,7 @@ UInt32 cProtocol_1_9_0::GetProtocolMobType(eMonsterType a_MobType)
case mtWolf: return 95;
case mtZombie: return 54;
case mtZombiePigman: return 57;
+ case mtZombieVillager: return 27;
}
UNREACHABLE("Unsupported mob type");
}