Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-12-26 02:28:13 +01:00
Code Issues Projects Releases Wiki Activity

Claiming now works again :P

Browse Source
This commit is contained in:
Olof Larsson 2011-10-25 22:18:54 +02:00
parent 72db45e45e
commit f76311c492
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/FPlayer.java
View File

@ -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.");
}

2
src/com/massivecraft/factions/Factions.java
View File

@ -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);