nalc/factions
1
0
Fork 0
forked from mtcontrib/factions
Code Issues Pull Requests Releases Wiki Activity

Fixed protection checking

Browse Source
This commit is contained in:
shamoanjac 2016-08-15 00:37:16 +02:00
parent 95ab0e3bfd
commit 07c6968778
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
factions.lua
View File

@ -492,6 +492,8 @@ function factions.load()
local raw_data = file:read("*a") local raw_data = file:read("*a")
factions.factions = minetest.deserialize(raw_data) factions.factions = minetest.deserialize(raw_data)
for facname, faction in pairs(factions.factions) do for facname, faction in pairs(factions.factions) do
faction.attacked_parcels = {}
faction.maxpower = 0.
minetest.log("action", facname..","..faction.name) minetest.log("action", facname..","..faction.name)
for player, rank in pairs(faction.players) do for player, rank in pairs(faction.players) do
minetest.log("action", player..","..rank) minetest.log("action", player..","..rank)
@ -501,6 +503,7 @@ function factions.load()
factions.parcels[parcelpos] = facname factions.parcels[parcelpos] = facname
end end
setmetatable(faction, factions.Faction) setmetatable(faction, factions.Faction)
-- compatiblity and later additions
end end
file:close() file:close()
end end
@ -609,7 +612,7 @@ minetest.is_protected = function(pos, player)
if not parcel_faction then if not parcel_faction then
return default_is_protected(pos, player) return default_is_protected(pos, player)
else else
parcel_faction = factions.factions[faction] parcel_faction = factions.factions[parcel_faction]
if parcel_faction.attacked_parcels[parcelpos] then -- chunk is being attacked if parcel_faction.attacked_parcels[parcelpos] then -- chunk is being attacked
if parcel_faction.attacked_parcels[parcelpos][player_faction] then -- attacked by the player's faction if parcel_faction.attacked_parcels[parcelpos][player_faction] then -- attacked by the player's faction
return false return false