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

Merge pull request #30 from Coder12a/master

Browse Source 
Bug fix: admin factions should not kill players that spawn on there land.
This commit is contained in:
Elkien3 2018-11-19 11:10:33 -06:00 committed by GitHub
commit fa800ca6d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mods/factions/chatcommands.lua
View File

@ -684,6 +684,7 @@ factions.register_command("setadmin", {
format = {"faction"}, format = {"faction"},
on_success = function(player, faction, pos, parcelpos, args) on_success = function(player, faction, pos, parcelpos, args)
args.factions[1].is_admin = false args.factions[1].is_admin = false
factions.save()
return true return true
end end
},false) },false)

4
mods/factions/factions.lua
View File

@ -844,7 +844,7 @@ factions.faction_tick = function()
if faction:is_online() then if faction:is_online() then
faction:increase_power(factions.power_per_tick) faction:increase_power(factions.power_per_tick)
end end
if now - faction.last_logon > factions.maximum_faction_inactivity then if faction.is_admin == false and now - faction.last_logon > factions.maximum_faction_inactivity then
faction:disband() faction:disband()
end end
end end
@ -985,7 +985,7 @@ function(player)
local parcel_faction = factions.get_faction_at(pos) local parcel_faction = factions.get_faction_at(pos)
if parcel_faction then if parcel_faction and parcel_faction.is_admin == false then
if not faction or parcel_faction.name ~= faction.name then if not faction or parcel_faction.name ~= faction.name then
minetest.after(1, function() minetest.after(1, function()
if player then if player then