diff --git a/mods/ENTITIES/mobs_mc/bat.lua b/mods/ENTITIES/mobs_mc/bat.lua
index 10e7a3adb..36415470a 100644
--- a/mods/ENTITIES/mobs_mc/bat.lua
+++ b/mods/ENTITIES/mobs_mc/bat.lua
@@ -40,9 +40,6 @@ mobs:register_mob("mobs_mc:bat", {
 ]]
 	},
 
-	water_damage = 1,
-	lava_damage = 4,
-	light_damage = 0,
 	fall_damage = 0,
 	view_range = 16,
 
diff --git a/mods/ENTITIES/mobs_mc/chicken.lua b/mods/ENTITIES/mobs_mc/chicken.lua
index fec0bb53e..c6ce85507 100644
--- a/mods/ENTITIES/mobs_mc/chicken.lua
+++ b/mods/ENTITIES/mobs_mc/chicken.lua
@@ -35,9 +35,6 @@ mobs:register_mob("mobs_mc:chicken", {
 		min = 0,
 		max = 2,},
 	},
-	water_damage = 1,
-	lava_damage = 4,
-	light_damage = 0,
 	fall_damage = 0,
 	fall_speed = -2.25,
 	sounds = {
diff --git a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
index 83d89ff15..cfc4991f5 100644
--- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
+++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua
@@ -26,9 +26,6 @@ local cow_def = {
 		min = 0,
 		max = 2,},
 	},
-	water_damage = 1,
-	lava_damage = 5,
-	light_damage = 0,
 	runaway = true,
 	sounds = {
 		random = "mobs_mc_cow",
diff --git a/mods/ENTITIES/mobs_mc/ender_dragon.lua b/mods/ENTITIES/mobs_mc/ender_dragon.lua
index a06f1c460..fd5543aea 100644
--- a/mods/ENTITIES/mobs_mc/ender_dragon.lua
+++ b/mods/ENTITIES/mobs_mc/ender_dragon.lua
@@ -47,9 +47,7 @@ mobs:register_mob("mobs_mc:enderdragon", {
 		min = 1,
 		max = 1},
 	},
-	water_damage = 0,
 	lava_damage = 0,
-	light_damage = 0,
 	on_rightclick = nil,
 	attack_type = "dogshoot",
 	arrow = "mobs_mc:fireball2",
diff --git a/mods/ENTITIES/mobs_mc/enderman.lua b/mods/ENTITIES/mobs_mc/enderman.lua
index 6af9ebe4a..ad74768be 100644
--- a/mods/ENTITIES/mobs_mc/enderman.lua
+++ b/mods/ENTITIES/mobs_mc/enderman.lua
@@ -320,8 +320,6 @@ mobs:register_mob("mobs_mc:enderman", {
 		end
 	end,
 	water_damage = 8,
-	lava_damage = 4,
-	light_damage = 0,
 	-- TODO: Increase view range when it detects being seen
 	-- Low view range to emulate that behaviour somehow
 	view_range = 4,
diff --git a/mods/ENTITIES/mobs_mc/endermite.lua b/mods/ENTITIES/mobs_mc/endermite.lua
index 0776ca47b..ebec262da 100644
--- a/mods/ENTITIES/mobs_mc/endermite.lua
+++ b/mods/ENTITIES/mobs_mc/endermite.lua
@@ -27,9 +27,6 @@ mobs:register_mob("mobs_mc:endermite", {
 	walk_velocity = 1,
 	run_velocity = 2,
 	jump = true,
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	fear_height = 4,
 	view_range = 16,
 	damage = 2,
diff --git a/mods/ENTITIES/mobs_mc/ghast.lua b/mods/ENTITIES/mobs_mc/ghast.lua
index 029d517a7..f840653c8 100644
--- a/mods/ENTITIES/mobs_mc/ghast.lua
+++ b/mods/ENTITIES/mobs_mc/ghast.lua
@@ -53,8 +53,6 @@ mobs:register_mob("mobs_mc:ghast", {
 		walk_start = 0,		walk_end = 40,
 		run_start = 0,		run_end = 40,
 	},
-	lava_damage = 4,
-	light_damage = 0,
 	fall_damage = 0,
 	view_range = 100,
 	--attack_type = "dogshoot",
diff --git a/mods/ENTITIES/mobs_mc/guardian.lua b/mods/ENTITIES/mobs_mc/guardian.lua
index 89ad0964a..24d0ebd08 100644
--- a/mods/ENTITIES/mobs_mc/guardian.lua
+++ b/mods/ENTITIES/mobs_mc/guardian.lua
@@ -10,6 +10,7 @@ mobs:register_mob("mobs_mc:guardian", {
 	type = "monster",
 	hp_min = 30,
 	hp_max = 30,
+	breath_max = -1,
     	passive = false,
 	attack_type = "dogfight",
 	pathfinding = 1,
@@ -76,9 +77,6 @@ mobs:register_mob("mobs_mc:guardian", {
 	stepheight = 0.1,
 	jump = false,
 	view_range = 16,
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	blood_amount = 0,
 })
 
diff --git a/mods/ENTITIES/mobs_mc/guardian_elder.lua b/mods/ENTITIES/mobs_mc/guardian_elder.lua
index 85ad5053f..f3799baff 100644
--- a/mods/ENTITIES/mobs_mc/guardian_elder.lua
+++ b/mods/ENTITIES/mobs_mc/guardian_elder.lua
@@ -10,6 +10,7 @@ mobs:register_mob("mobs_mc:guardian_elder", {
 	type = "monster",
 	hp_min = 80,
 	hp_max = 80,
+	breath_max = -1,
     	passive = false,
 	attack_type = "dogfight",
 	pathfinding = 1,
@@ -80,9 +81,6 @@ mobs:register_mob("mobs_mc:guardian_elder", {
 	fly_in = { mobs_mc.items.water_source, mobs_mc.items.river_water_source },
 	stepheight = 0.1,
 	jump = false,
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	view_range = 16,
 	blood_amount = 0,
 })
diff --git a/mods/ENTITIES/mobs_mc/horse.lua b/mods/ENTITIES/mobs_mc/horse.lua
index c20543003..d51a1c660 100644
--- a/mods/ENTITIES/mobs_mc/horse.lua
+++ b/mods/ENTITIES/mobs_mc/horse.lua
@@ -116,8 +116,6 @@ local horse = {
 	hp_min = 15,
 	hp_max = 30,
 	floats = 1,
-	lava_damage = 4,
-	water_damage = 1,
 	makes_footstep_sound = true,
 	jump = true,
 	jump_height = 5.75, -- can clear 2.5 blocks
@@ -324,6 +322,7 @@ mobs:register_mob("mobs_mc:horse", horse)
 
 -- Skeleton horse
 local skeleton_horse = table.copy(horse)
+skeleton_horse.breath_max = -1
 skeleton_horse.textures = {{"blank.png", "mobs_mc_horse_skeleton.png", "blank.png"}}
 skeleton_horse.drops = {
 	{name = mobs_mc.items.bone,
@@ -342,6 +341,7 @@ mobs:register_mob("mobs_mc:skeleton_horse", skeleton_horse)
 
 -- Zombie horse
 local zombie_horse = table.copy(horse)
+zombie_horse.breath_max = -1
 zombie_horse.textures = {{"blank.png", "mobs_mc_horse_zombie.png", "blank.png"}}
 zombie_horse.drops = {
 	{name = mobs_mc.items.rotten_flesh,
diff --git a/mods/ENTITIES/mobs_mc/iron_golem.lua b/mods/ENTITIES/mobs_mc/iron_golem.lua
index 9ca88ba5d..95a088dec 100644
--- a/mods/ENTITIES/mobs_mc/iron_golem.lua
+++ b/mods/ENTITIES/mobs_mc/iron_golem.lua
@@ -16,6 +16,7 @@ mobs:register_mob("mobs_mc:iron_golem", {
 	passive = true,
 	hp_min = 100,
 	hp_max = 100,
+	breath_max = -1,
 	collisionbox = {-0.7, -0.01, -0.7, 0.7, 2.69, 0.7},
 	visual = "mesh",
 	mesh = "mobs_mc_iron_golem.b3d",
@@ -48,9 +49,6 @@ mobs:register_mob("mobs_mc:iron_golem", {
 		min = 0,
 		max = 2,},
 	},
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	fall_damage = 0,
 	animation = {
 		stand_speed = 15, walk_speed = 15, run_speed = 25, punch_speed = 15,
diff --git a/mods/ENTITIES/mobs_mc/llama.lua b/mods/ENTITIES/mobs_mc/llama.lua
index a69db0bac..92da233a5 100644
--- a/mods/ENTITIES/mobs_mc/llama.lua
+++ b/mods/ENTITIES/mobs_mc/llama.lua
@@ -32,9 +32,6 @@ mobs:register_mob("mobs_mc:llama", {
 		min = 0,
 		max = 2,},
 	},
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	fear_height = 4,
 	sounds = {
 		random = "mobs_mc_llama",
diff --git a/mods/ENTITIES/mobs_mc/ocelot.lua b/mods/ENTITIES/mobs_mc/ocelot.lua
index 634d77a3f..e2b37220f 100644
--- a/mods/ENTITIES/mobs_mc/ocelot.lua
+++ b/mods/ENTITIES/mobs_mc/ocelot.lua
@@ -42,9 +42,6 @@ local ocelot = {
 	run_velocity = 3,
 	floats = 1,
 	runaway = true,
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	fall_damage = 0,
 	fear_height = 4,
 	sounds = {
diff --git a/mods/ENTITIES/mobs_mc/parrot.lua b/mods/ENTITIES/mobs_mc/parrot.lua
index 7e465e8f5..9474c2b77 100644
--- a/mods/ENTITIES/mobs_mc/parrot.lua
+++ b/mods/ENTITIES/mobs_mc/parrot.lua
@@ -44,9 +44,6 @@ mobs:register_mob("mobs_mc:parrot", {
 		--fly_end = 45,
 	},
 	walk_chance = 100,
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	fall_damage = 0,
 	fall_speed = -2.25,
 	attack_type = "dogfight",
diff --git a/mods/ENTITIES/mobs_mc/pig.lua b/mods/ENTITIES/mobs_mc/pig.lua
index 2b10c99be..472d8f771 100644
--- a/mods/ENTITIES/mobs_mc/pig.lua
+++ b/mods/ENTITIES/mobs_mc/pig.lua
@@ -25,9 +25,6 @@ mobs:register_mob("mobs_mc:pig", {
 		min = 1,
 		max = 3,},
 	},
-	water_damage = 1,
-	lava_damage = 4,
-	light_damage = 0,
 	fear_height = 4,
 	sounds = {
 		random = "mobs_pig",
diff --git a/mods/ENTITIES/mobs_mc/polar_bear.lua b/mods/ENTITIES/mobs_mc/polar_bear.lua
index 1db07e0f2..438ea3207 100644
--- a/mods/ENTITIES/mobs_mc/polar_bear.lua
+++ b/mods/ENTITIES/mobs_mc/polar_bear.lua
@@ -14,6 +14,7 @@ mobs:register_mob("mobs_mc:polar_bear", {
 	stepheight = 1.2,
 	hp_min = 30,
 	hp_max = 30,
+        breath_max = -1,
 	collisionbox = {-0.7, -0.01, -0.7, 0.7, 1.39, 0.7},
 	visual = "mesh",
 	mesh = "mobs_mc_polarbear.b3d",
@@ -41,10 +42,7 @@ mobs:register_mob("mobs_mc:polar_bear", {
 		max = 2,},
 
 	},
-	water_damage = 0,
 	floats = 1,
-	lava_damage = 5,
-	light_damage = 0,
 	fear_height = 4,
 	-- TODO: sounds
 	animation = {
diff --git a/mods/ENTITIES/mobs_mc/rabbit.lua b/mods/ENTITIES/mobs_mc/rabbit.lua
index ea71d788e..8803b7546 100644
--- a/mods/ENTITIES/mobs_mc/rabbit.lua
+++ b/mods/ENTITIES/mobs_mc/rabbit.lua
@@ -35,9 +35,6 @@ local rabbit = {
 		-- TODO: Drop rabbit's foot when it's useful
 		--{name = mobs_mc.items.rabbit_foot, chance = 10, min = 1, max = 1},
 	},
-	water_damage = 1,
-	lava_damage = 4,
-	light_damage = 0,
 	fear_height = 4,
 	animation = {
 		speed_normal = 25,		speed_run = 50,
diff --git a/mods/ENTITIES/mobs_mc/sheep.lua b/mods/ENTITIES/mobs_mc/sheep.lua
index 2f069f85b..3d643ec89 100644
--- a/mods/ENTITIES/mobs_mc/sheep.lua
+++ b/mods/ENTITIES/mobs_mc/sheep.lua
@@ -67,9 +67,6 @@ mobs:register_mob("mobs_mc:sheep", {
 		min = 1,
 		max = 1,},
 	},
-	water_damage = 1,
-	lava_damage = 4,
-	light_damage = 0,
 	fear_height = 4,
 	sounds = {
 		random = "mobs_sheep",
diff --git a/mods/ENTITIES/mobs_mc/shulker.lua b/mods/ENTITIES/mobs_mc/shulker.lua
index b3cd3c6e4..28d60dd18 100644
--- a/mods/ENTITIES/mobs_mc/shulker.lua
+++ b/mods/ENTITIES/mobs_mc/shulker.lua
@@ -47,9 +47,6 @@ mobs:register_mob("mobs_mc:shulker", {
 	blood_amount = 0,
 	view_range = 16,
 	fear_height = 4,
-	water_damage = 1,
-	lava_damage = 4,
-	light_damage = 0,
 })
 
 -- bullet arrow (weapon)
diff --git a/mods/ENTITIES/mobs_mc/silverfish.lua b/mods/ENTITIES/mobs_mc/silverfish.lua
index 7f19d9a2c..5bd077a7c 100644
--- a/mods/ENTITIES/mobs_mc/silverfish.lua
+++ b/mods/ENTITIES/mobs_mc/silverfish.lua
@@ -29,9 +29,6 @@ mobs:register_mob("mobs_mc:silverfish", {
 	walk_velocity = 0.6,
 	run_velocity = 2,
 	jump = true,
-	water_damage = 1,
-	lava_damage = 4,
-	light_damage = 0,
 	fear_height = 4,
 	replace_what = mobs_mc.replace.silverfish,
 	replace_rate = 2,
diff --git a/mods/ENTITIES/mobs_mc/skeleton+stray.lua b/mods/ENTITIES/mobs_mc/skeleton+stray.lua
index 35cc9ed8c..128f60c82 100644
--- a/mods/ENTITIES/mobs_mc/skeleton+stray.lua
+++ b/mods/ENTITIES/mobs_mc/skeleton+stray.lua
@@ -15,6 +15,7 @@ local skeleton = {
 	type = "monster",
 	hp_min = 20,
 	hp_max = 20,
+	breath_max = -1,
 	collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.98, 0.3},
 	pathfinding = 1,
 	group_attack = true,
@@ -73,8 +74,6 @@ local skeleton = {
 		die_speed = 15,
 		die_loop = false,
 	},
-	water_damage = 1,
-	lava_damage = 4,
 	sunlight_damage = 1,
 	view_range = 16,
 	fear_height = 4,
diff --git a/mods/ENTITIES/mobs_mc/skeleton_wither.lua b/mods/ENTITIES/mobs_mc/skeleton_wither.lua
index 16f353cee..8d8ebb3ba 100644
--- a/mods/ENTITIES/mobs_mc/skeleton_wither.lua
+++ b/mods/ENTITIES/mobs_mc/skeleton_wither.lua
@@ -13,6 +13,7 @@ mobs:register_mob("mobs_mc:witherskeleton", {
 	type = "monster",
 	hp_min = 20,
 	hp_max = 20,
+	breath_max = -1,
 	pathfinding = 1,
 	group_attack = true,
 	collisionbox = {-0.35, -0.01, -0.35, 0.35, 2.39, 0.35},
diff --git a/mods/ENTITIES/mobs_mc/slime+magma_cube.lua b/mods/ENTITIES/mobs_mc/slime+magma_cube.lua
index 4fbeea765..8cb9dc8cc 100644
--- a/mods/ENTITIES/mobs_mc/slime+magma_cube.lua
+++ b/mods/ENTITIES/mobs_mc/slime+magma_cube.lua
@@ -94,9 +94,6 @@ local slime_big = {
 		death_start = 88,
 		death_end = 118,
 	},
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	fall_damage = 0,
 	view_range = 16,
 	attack_type = "dogfight",
diff --git a/mods/ENTITIES/mobs_mc/spider.lua b/mods/ENTITIES/mobs_mc/spider.lua
index 9ec7f44b9..f6ba05e42 100644
--- a/mods/ENTITIES/mobs_mc/spider.lua
+++ b/mods/ENTITIES/mobs_mc/spider.lua
@@ -46,9 +46,6 @@ local spider = {
 		{name = mobs_mc.items.spider_eye, chance = 3, min = 1, max = 1,},
 	},
 	specific_attack = { "player", "mobs_mc:iron_golem" },
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	fear_height = 4,
 	animation = {
 		stand_speed = 10,
diff --git a/mods/ENTITIES/mobs_mc/squid.lua b/mods/ENTITIES/mobs_mc/squid.lua
index b22ca08f4..28d2fe738 100644
--- a/mods/ENTITIES/mobs_mc/squid.lua
+++ b/mods/ENTITIES/mobs_mc/squid.lua
@@ -45,12 +45,10 @@ mobs:register_mob("mobs_mc:squid", {
     stepheight = 0.1,
     fly = true,
     fly_in = { mobs_mc.items.water_source, mobs_mc.items.river_water_source },
+    breathes_in_water = true,
     jump = false,
     fall_speed = 0.5,
     view_range = 16,
-    water_damage = 0,
-    lava_damage = 4,
-    light_damage = 0,
     runaway = true,
     fear_height = 4,
     blood_texture = "mobs_mc_squid_blood.png",
diff --git a/mods/ENTITIES/mobs_mc/vex.lua b/mods/ENTITIES/mobs_mc/vex.lua
index 692783e08..938e21987 100644
--- a/mods/ENTITIES/mobs_mc/vex.lua
+++ b/mods/ENTITIES/mobs_mc/vex.lua
@@ -84,9 +84,6 @@ mobs:register_mob("mobs_mc:vex", {
 			end
 		end
 	end,
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	fly = true,
 	fly_in = {"air"},
 })
diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua
index e42cb690e..fe1ff5267 100644
--- a/mods/ENTITIES/mobs_mc/villager.lua
+++ b/mods/ENTITIES/mobs_mc/villager.lua
@@ -945,9 +945,6 @@ mobs:register_mob("mobs_mc:villager", {
 		die_end = 220,
 		die_loop = false,
 	},
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	view_range = 16,
 	fear_height = 4,
 	jump = true,
diff --git a/mods/ENTITIES/mobs_mc/villager_evoker.lua b/mods/ENTITIES/mobs_mc/villager_evoker.lua
index 22af9d4b5..7bb48e729 100644
--- a/mods/ENTITIES/mobs_mc/villager_evoker.lua
+++ b/mods/ENTITIES/mobs_mc/villager_evoker.lua
@@ -74,9 +74,6 @@ mobs:register_mob("mobs_mc:evoker", {
 		die_end = 200,
 		die_loop = false,
 	},
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	view_range = 16,
 	fear_height = 4,
 })
diff --git a/mods/ENTITIES/mobs_mc/villager_illusioner.lua b/mods/ENTITIES/mobs_mc/villager_illusioner.lua
index de4ee89d1..fe3efa8a8 100644
--- a/mods/ENTITIES/mobs_mc/villager_illusioner.lua
+++ b/mods/ENTITIES/mobs_mc/villager_illusioner.lua
@@ -48,7 +48,6 @@ mobs:register_mob("mobs_mc:illusioner", {
 	},
 	view_range = 16,
 	fear_height = 4,
-	lava_damage = 4,
 })
 
 mobs:register_egg("mobs_mc:illusioner", S("Illusioner"), "mobs_mc_spawn_icon_illusioner.png", 0)
diff --git a/mods/ENTITIES/mobs_mc/villager_vindicator.lua b/mods/ENTITIES/mobs_mc/villager_vindicator.lua
index 9558074a7..a228aa560 100644
--- a/mods/ENTITIES/mobs_mc/villager_vindicator.lua
+++ b/mods/ENTITIES/mobs_mc/villager_vindicator.lua
@@ -61,9 +61,6 @@ mobs:register_mob("mobs_mc:vindicator", {
 		die_end = 180,
 		die_loop = false,
 	},
-	water_damage = 1,
-	lava_damage = 4,
-	light_damage = 0,
 	view_range = 16,
 	fear_height = 4,
 
diff --git a/mods/ENTITIES/mobs_mc/villager_zombie.lua b/mods/ENTITIES/mobs_mc/villager_zombie.lua
index e23f86bb4..bc974277c 100644
--- a/mods/ENTITIES/mobs_mc/villager_zombie.lua
+++ b/mods/ENTITIES/mobs_mc/villager_zombie.lua
@@ -16,6 +16,7 @@ mobs:register_mob("mobs_mc:villager_zombie", {
 	type = "monster",
 	hp_min = 20,
 	hp_max = 20,
+	breath_max = -1,
 	armor = 90,
 	collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3},
 	visual = "mesh",
@@ -71,8 +72,6 @@ mobs:register_mob("mobs_mc:villager_zombie", {
 		run_start = 0,
         run_end = 20,
 	},
-	water_damage = 1,
-	lava_damage = 5,
 	sunlight_damage = 1,
 	view_range = 16,
 	fear_height = 4,
diff --git a/mods/ENTITIES/mobs_mc/witch.lua b/mods/ENTITIES/mobs_mc/witch.lua
index 8e8d80252..db183e671 100644
--- a/mods/ENTITIES/mobs_mc/witch.lua
+++ b/mods/ENTITIES/mobs_mc/witch.lua
@@ -63,9 +63,6 @@ mobs:register_mob("mobs_mc:witch", {
 		shoot_start = 50,
 		shoot_end = 82,
 	},
-	water_damage = 1,
-	lava_damage = 5,
-	light_damage = 0,
 	view_range = 16,
 	fear_height = 4,
 
diff --git a/mods/ENTITIES/mobs_mc/wither.lua b/mods/ENTITIES/mobs_mc/wither.lua
index 05431ce98..a6e6c70a5 100644
--- a/mods/ENTITIES/mobs_mc/wither.lua
+++ b/mods/ENTITIES/mobs_mc/wither.lua
@@ -48,9 +48,7 @@ mobs:register_mob("mobs_mc:wither", {
 		min = 1,
 		max = 1},
 	},
-	water_damage = 0,
 	lava_damage = 0,
-	light_damage = 0,
 	attack_type = "dogshoot",
 	explosion_radius = 3,
 	explosion_fire = false,
diff --git a/mods/ENTITIES/mobs_mc/wolf.lua b/mods/ENTITIES/mobs_mc/wolf.lua
index b7e69864a..e8e5de1f7 100644
--- a/mods/ENTITIES/mobs_mc/wolf.lua
+++ b/mods/ENTITIES/mobs_mc/wolf.lua
@@ -45,9 +45,6 @@ local wolf = {
 	reach = 2,
 	attack_type = "dogfight",
 	fear_height = 4,
-	water_damage = 0,
-	lava_damage = 4,
-	light_damage = 0,
 	follow = mobs_mc.follow.wolf,
 	on_rightclick = function(self, clicker)
 		-- Try to tame wolf (intentionally does NOT use mobs:feed_tame)
diff --git a/mods/ENTITIES/mobs_mc/zombie.lua b/mods/ENTITIES/mobs_mc/zombie.lua
index f08d364d8..48e7fedf2 100644
--- a/mods/ENTITIES/mobs_mc/zombie.lua
+++ b/mods/ENTITIES/mobs_mc/zombie.lua
@@ -42,6 +42,7 @@ local zombie = {
 	type = "monster",
 	hp_min = 20,
 	hp_max = 20,
+	breath_max = -1,
 	armor = 90,
 	collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3},
 	visual = "mesh",
@@ -99,7 +100,6 @@ mobs:register_mob("mobs_mc:baby_zombie", baby_zombie)
 local husk = table.copy(zombie)
 husk.textures = {{"mobs_mc_husk.png"}}
 husk.sunlight_damage = 0
-husk.water_damage = 3
 husk.drops = drops_common
 -- TODO: Husks avoid water
 
diff --git a/mods/ENTITIES/mobs_mc/zombiepig.lua b/mods/ENTITIES/mobs_mc/zombiepig.lua
index f21ea4faf..660346015 100644
--- a/mods/ENTITIES/mobs_mc/zombiepig.lua
+++ b/mods/ENTITIES/mobs_mc/zombiepig.lua
@@ -16,6 +16,7 @@ local pigman = {
 	passive = false,
 	hp_min = 20,
 	hp_max = 20,
+	breath_max = -1,
 	armor = 90,
 	attack_type = "dogfight",
 	group_attack = { "mobs_mc:pigman", "mobs_mc:baby_pigman" },
@@ -73,9 +74,7 @@ local pigman = {
 		punch_start = 90,
 		punch_end = 130,
 	},
-	water_damage = 1,
 	lava_damage = 0,
-	light_damage = 0,
 	fear_height = 4,
 	view_range = 16,
 }