Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
Conflicts: mods/other/random_messages/init.lua
This commit is contained in:
commit
ed65ddb6d0
5 changed files with 23 additions and 7 deletions
|
@ -133,7 +133,7 @@ minetest.override_item("ctf_bandages:bandage", {
|
|||
})
|
||||
|
||||
local diggers = {}
|
||||
local DIG_COOLDOWN = 45
|
||||
local DIG_COOLDOWN = 30
|
||||
local DIG_DIST_LIMIT = 30
|
||||
local DIG_SPEED = 0.1
|
||||
|
||||
|
|
|
@ -74,8 +74,9 @@ check_grapple("shooter_hook:grapple_hook")
|
|||
local old_grapple_step = minetest.registered_entities["shooter_hook:hook"].on_step
|
||||
minetest.registered_entities["shooter_hook:hook"].on_step = function(self, dtime, ...)
|
||||
-- User left the game. Life is no longer worth living for this poor hook
|
||||
if not self.user then
|
||||
if not self.user or not minetest.get_player_by_name(self.user) then
|
||||
self.object:remove()
|
||||
return
|
||||
end
|
||||
|
||||
-- Remove entity if player has flag
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue