Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-24 11:53:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix loosing interact bug in mcl_shields

Browse Source
This commit is contained in:
Elias Åström 2024-02-26 19:50:03 +01:00 committed by the-real-herowl
parent b136cbf9bb
commit cffc8e0145
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mods/ITEMS/mcl_shields/init.lua
View File

@ -211,16 +211,36 @@ local function set_interact(player, interact)
return return
end end
local meta = player:get_meta() local meta = player:get_meta()
if meta:get_int("mcl_privs:interact_revoked") ~= 1 then
privs.interact = interact if interact and meta:get_int("mcl_shields:interact_revoked") ~= 0 then
meta:set_int("mcl_shields:interact_revoked", 0)
privs.interact = true
elseif not interact then
meta:set_int("mcl_shields:interact_revoked", privs.interact and 1 or 0)
privs.interact = nil
end
minetest.set_player_privs(player_name, privs) minetest.set_player_privs(player_name, privs)
meta:set_int("mcl_privs:interact_revoked",0)
end end
-- Prevent player from being able to circumvent interact privilage removal by
-- using shield.
minetest.register_on_priv_revoke(function(name, revoker, priv)
if priv == "interact" and revoker then
local player = minetest.get_player_by_name(name)
if not player then
return
end end
local meta = player:get_meta()
meta:set_int("mcl_shields:interact_revoked", 0)
end
end)
local shield_hud = {} local shield_hud = {}
local function remove_shield_hud(player) local function remove_shield_hud(player)
set_interact(player, true)
if not shield_hud[player] then return end --this function takes a long time. only run it when necessary if not shield_hud[player] then return end --this function takes a long time. only run it when necessary
player:hud_remove(shield_hud[player]) player:hud_remove(shield_hud[player])
shield_hud[player] = nil shield_hud[player] = nil
@ -233,7 +253,6 @@ local function remove_shield_hud(player)
end end
playerphysics.remove_physics_factor(player, "speed", "shield_speed") playerphysics.remove_physics_factor(player, "speed", "shield_speed")
set_interact(player, true)
end end
local function add_shield_entity(player, i) local function add_shield_entity(player, i)
@ -344,7 +363,7 @@ local function add_shield_hud(shieldstack, player, blocking)
z_index = -200, z_index = -200,
}) })
playerphysics.add_physics_factor(player, "speed", "shield_speed", 0.5) playerphysics.add_physics_factor(player, "speed", "shield_speed", 0.5)
set_interact(player, nil) set_interact(player, false)
end end
local function update_shield_hud(player, blocking, shieldstack) local function update_shield_hud(player, blocking, shieldstack)