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

Yet another protection fix

Browse Source
This commit is contained in:
shamoanjac 2016-08-19 23:10:01 +02:00
parent 367879cd4e
commit 7c98a705a8
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
factions.lua
View File

@ -389,9 +389,8 @@ function factions.Faction.is_online(self)
end end
function factions.Faction.attack_parcel(self, parcelpos) function factions.Faction.attack_parcel(self, parcelpos)
local attacked_faction = factions.parcels[parcelpos] local attacked_faction = factions.get_parcel_faction(parcelpos)
if attacked_faction then if attacked_faction then
attacked_faction = factions.factions[attacked_faction]
self.power = self.power - factions.power_per_attack self.power = self.power - factions.power_per_attack
if attacked_faction.attacked_parcels[parcelpos] then if attacked_faction.attacked_parcels[parcelpos] then
attacked_faction.attacked_parcels[parcelpos][self.name] = true attacked_faction.attacked_parcels[parcelpos][self.name] = true
@ -783,16 +782,16 @@ minetest.is_protected = function(pos, player)
return not player_faction:has_permission(player, "claim") and player_faction.power > 0. and not parcel_faction.is_admin return not player_faction:has_permission(player, "claim") and player_faction.power > 0. and not parcel_faction.is_admin
end end
-- no faction -- no faction
if not parcel_faction or not player_faction then if not parcel_faction then
return default_is_protected(pos, player) return default_is_protected(pos, player)
elseif not player_faction then elseif player_faction then
return true if parcel_faction.name == player_faction.name then
else
if parcel_faction.name == player_faction then
return not parcel_faction:has_permission(player, "build") return not parcel_faction:has_permission(player, "build")
else else
return not parcel_faction:parcel_is_attacked_by(parcelpos, player_faction) return not parcel_faction:parcel_is_attacked_by(parcelpos, player_faction)
end end
else
return true
end end
end end