Elkien3/knockout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevented 'player chains'

Browse Source
This commit is contained in:
Billy S 2018-07-24 21:28:56 -04:00
parent 1398c750b5
commit e8e9d0d2f2
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
handlers.lua
View File

@ -1,15 +1,3 @@
local function carrierQuit(pName)
if knockout.carrying[pName] then
local cName = knockout.carrying[pName]
local carried = minetest.get_player_by_name(cName)
if carried then
carried:set_detach()
end
knockout.knockout(cName)
knockout.carrying[pName] = nil
end
end
-- Create formspec structure
local function getFs(name)
return "size[5,3]label[1.4,1;You are unconscious!]label[0.8,2;Time remaining: " .. tostring(knockout.knocked_out[name]) .. " seconds]"
@ -34,7 +22,7 @@ minetest.register_globalstep(function(dtime)
for name, _ in pairs(knockout.carrying) do
local p = minetest.get_player_by_name(name)
if p:get_player_control().jump then
carrierQuit(name)
knockout.carrier_drop(name)
end
end
end)
@ -53,12 +41,12 @@ minetest.register_on_dieplayer(function(p)
local pName = p:get_player_name()
knockout.wake_up(pName)
-- If the player is carrying another player, drop them
carrierQuit(pName)
knockout.carrier_drop(pName)
end)
-- If the player was carrying another player, drop them
minetest.register_on_leaveplayer(function(p, _)
carrierQuit(p:get_player_name())
knockout.carrier_drop(p:get_player_name())
end)
-- Catch those pesky players that try to leave/join to get un-knocked out

15
init.lua
View File

@ -84,6 +84,19 @@ knockout.save = function()
knockout.storage:set_string("knocked_out", minetest.serialize(knockout.knocked_out))
end
-- Drop a player
knockout.carrier_drop = function(pName) -- pname = name of carrier
if knockout.carrying[pName] then
local cName = knockout.carrying[pName]
local carried = minetest.get_player_by_name(cName)
if carried then
carried:set_detach()
end
knockout.knockout(cName)
knockout.carrying[pName] = nil
end
end
-- Knock out player
knockout.knockout = function(pName, duration)
local p = minetest.get_player_by_name(pName)
@ -94,6 +107,8 @@ knockout.knockout = function(pName, duration)
end
-- Incase player is riding a horse or something
p:set_detach()
-- If the player is carrying another player, fix that
knockout.carrier_drop(pName)
-- Freeze player using entites
local pos = p:get_pos()
local e = minetest.add_entity(pos, "knockout:entity", pName)