Skip to content

handle players on destroy #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
h3ndrik wants to merge 2 commits into
base: master
Choose a base branch
from
Open

handle players on destroy #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9db6b0a
detach players on destroy
h3ndrik Dec 3, 2021
542c20b
remove old safeguards
h3ndrik Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions heli_entities.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,16 +235,13 @@ minetest.register_entity("nss_helicopter:heli", {
return
end
local name = puncher:get_player_name()
if self.owner and self.owner ~= name and self.owner ~= "" then return end
if self.owner and self.owner ~= name and self.owner ~= "" then
if not minetest.check_player_privs(puncher, {protection_bypass=true}) then return end
end
if self.owner == nil then
self.owner = name
end

if self.driver_name and self.driver_name ~= name then
-- do not allow other players to remove the object while there is a driver
return
end

local touching_ground, liquid_below = helicopter.check_node_below(self.object)

--XXXXXXXX
Expand Down
14 changes: 7 additions & 7 deletions heli_utilities.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ function helicopter.destroy(self, puncher)
end

if self.driver_name then
-- detach the driver first (puncher must be driver)
puncher:set_detach()
puncher:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
player_api.player_attached[name] = nil
-- player should stand again
player_api.set_animation(puncher, "stand")
self.driver_name = nil
local driver = minetest.get_player_by_name(self.driver_name)
helicopter.dettach(self, driver)
end

if self._passenger then
local passenger = minetest.get_player_by_name(self._passenger)
helicopter.dettach_pax(self, passenger)
end

local pos = self.object:get_pos()
Expand Down