From 9307e06df5c5d90da29e70e85cd312a6343bc1f5 Mon Sep 17 00:00:00 2001
From: epCode <eeliperry@gmail.com>
Date: Sun, 14 Feb 2021 20:01:41 -0800
Subject: [PATCH] remove hostile llama

---
 mods/ENTITIES/mobs_mc/llama.lua               |  33 ++----------------
 .../mobs_mc/textures/mobs_mc_spit.png         | Bin 267 -> 0 bytes
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 mods/ENTITIES/mobs_mc/textures/mobs_mc_spit.png

diff --git a/mods/ENTITIES/mobs_mc/llama.lua b/mods/ENTITIES/mobs_mc/llama.lua
index d2e1cb2d7..36d020a65 100644
--- a/mods/ENTITIES/mobs_mc/llama.lua
+++ b/mods/ENTITIES/mobs_mc/llama.lua
@@ -25,7 +25,7 @@ local carpets = {
 }
 
 mobs:register_mob("mobs_mc:llama", {
-	type = "monster",
+	type = "animal",
 	spawn_class = "passive",
 	hp_min = 15,
 	hp_max = 30,
@@ -84,11 +84,8 @@ mobs:register_mob("mobs_mc:llama", {
 	},
 	follow = mobs_mc.follow.llama,
 	view_range = 16,
-	attack_type = "dogshoot",
-	arrow = "mobs_mc:llama_spit",
-	shoot_interval = 1.5,
-	shoot_offset = .5,
 	do_custom = function(self, dtime)
+
 		-- set needed values if not already present
 		if not self.v2 then
 			self.v2 = 0
@@ -219,32 +216,6 @@ mobs:register_mob("mobs_mc:llama", {
 
 })
 
-mobs:register_arrow("mobs_mc:llama_spit", {
-	visual = "sprite",
-	visual_size = {x = 0.3, y = 0.3},
-	textures = {"mobs_mc_spit.png"},
-	velocity = 30,
-
-	-- Direct hit, no fire... just plenty of pain
-	hit_player = function(self, player)
-		if rawget(_G, "armor") and armor.last_damage_types then
-			armor.last_damage_types[player:get_player_name()] = "llama_spit"
-		end
-		player:punch(self.object, 1.0, {
-			full_punch_interval = 1.0,
-			damage_groups = {fleshy = 1, knockback = 10},
-		}, nil)
-	end,
-
-	hit_mob = function(self, mob)
-		mob:punch(self.object, 1.0, {
-			full_punch_interval = 1.0,
-			damage_groups = {fleshy = 1, knockback = 10},
-		}, nil)
-	end,
-})
-
-
 --spawn
 mobs:spawn_specific("mobs_mc:llama", mobs_mc.spawn.savanna, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 15000, 5, mobs_mc.spawn_height.water+15, mobs_mc.spawn_height.overworld_max)
 
diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spit.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spit.png
deleted file mode 100644
index 4907d2386902eb8aa850871368f4fff4d419a27f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE<hRxemd{22U45`9+AZi
z4BWyX%*Zfnjs#GUy~NYkmHjCbm!N=<^?u9KK%p6)E{-7<r;`&TJ~aqVcPT3RRG;$i
z&d%bEt5OdxH8e5V!sGkO-mH1XhM7`QQc=s+uaEE6YxC6=-u3o|iL!LlJ5#lo#Db5H
zj;5vj+n9VjhGQ4Q^t76W&Q}*XxY<k6qa!2VM((XD6|d6SkYHT;_0`qbg$oy^hJ}Sy
zpYZbFKDAeZZ~w$U{d#@6h7Wx@f&73UoO5rpWu`GPD7RUzf3y3sFVKw)p00i_>zopr
E0G5be>i_@%