minetest-stuffs/dragonfire-client-waspsaliva
minetest-stuffs/dragonfire-client-waspsaliva
1
0
Fork 0
Code Issues 2 Pull Requests Releases 2 Wiki Activity

combat: fix killaura - only attack enemies

Browse Source
This commit is contained in:
cora 2020-12-10 23:57:49 +01:00 committed by Schmappie Eldress
parent e05a24b728
commit 4a40d7daff
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
clientmods/dragonfire/combat/init.lua
View File

@ -4,7 +4,7 @@ local used_sneak = true
local totem_move_action = InventoryAction("move") local totem_move_action = InventoryAction("move")
totem_move_action:to("current_player", "main", 9) totem_move_action:to("current_player", "main", 9)
minetest.register_list_command("friend", "Configure Friend List (friends dont get attacked by Killaura or Forcefield)", "friendlist") --minetest.register_list_command("friend", "Configure Friend List (friends dont get attacked by Killaura or Forcefield)", "friendlist")
minetest.register_globalstep(function(dtime) minetest.register_globalstep(function(dtime)
local player = minetest.localplayer local player = minetest.localplayer
@ -13,21 +13,12 @@ minetest.register_globalstep(function(dtime)
local pointed = minetest.get_pointed_thing() local pointed = minetest.get_pointed_thing()
local item = player:get_wielded_item():get_name() local item = player:get_wielded_item():get_name()
if minetest.settings:get_bool("killaura") or minetest.settings:get_bool("forcefield") and control.dig then if minetest.settings:get_bool("killaura") or minetest.settings:get_bool("forcefield") and control.dig then
local friendlist = minetest.settings:get("friendlist"):split(",")
for _, obj in ipairs(minetest.get_objects_inside_radius(player:get_pos(), 5)) do for _, obj in ipairs(minetest.get_objects_inside_radius(player:get_pos(), 5)) do
local do_attack = true local do_attack = true
if obj:is_local_player() then if obj:is_local_player() then do_attack = false end
do_attack = false if(obj:is_player() and not fren.is_enemy(obj:get_name())) then do_attack=false end
else
for _, friend in ipairs(friendlist) do
if obj:get_name() == friend or obj:get_nametag() == friend then
do_attack = false
break
end
end
end
if do_attack then if do_attack then
obj:punch() obj:punch()
end end
end end
elseif minetest.settings:get_bool("crystal_pvp") then elseif minetest.settings:get_bool("crystal_pvp") then
@ -55,14 +46,14 @@ minetest.register_globalstep(function(dtime)
minetest.switch_to_item("mcl_end:crystal") minetest.switch_to_item("mcl_end:crystal")
minetest.place_node(pos) minetest.place_node(pos)
placed_crystal = true placed_crystal = true
end end
end end
used_sneak = true used_sneak = true
else else
used_sneak = false used_sneak = false
end end
end end
if minetest.settings:get_bool("autototem") then if minetest.settings:get_bool("autototem") then
local totem_stack = minetest.get_inventory("current_player").main[9] local totem_stack = minetest.get_inventory("current_player").main[9]
if totem_stack and totem_stack:get_name() ~= "mobs_mc:totem" then if totem_stack and totem_stack:get_name() ~= "mobs_mc:totem" then