Claiming now works again :P
This commit is contained in:
parent
72db45e45e
commit
f76311c492
@ -550,7 +550,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
|
||||
{
|
||||
error = P.p.txt.parse("<b>You can't claim more land! You need more power!");
|
||||
}
|
||||
else if (currentFaction.getRelationTo(forFaction).isAtLeast(Rel.TRUCE))
|
||||
else if (currentFaction.getRelationTo(forFaction).isAtLeast(Rel.TRUCE) && ! currentFaction.isNone())
|
||||
{
|
||||
error = P.p.txt.parse("<b>You can't claim this land due to your relation with the current owner.");
|
||||
}
|
||||
|
@ -102,7 +102,7 @@ public class Factions extends EntityCollection<Faction>
|
||||
public void setFlagsForWilderness(Faction faction)
|
||||
{
|
||||
faction.setFlag(FFlag.PERMANENT, true);
|
||||
faction.setFlag(FFlag.PEACEFUL, true);
|
||||
faction.setFlag(FFlag.PEACEFUL, false);
|
||||
faction.setFlag(FFlag.INFPOWER, true);
|
||||
faction.setFlag(FFlag.POWERLOSS, true);
|
||||
faction.setFlag(FFlag.PVP, true);
|
||||
|
Loading…
Reference in New Issue
Block a user