Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another modification to the claim rights checking

Browse Source
This commit is contained in:
Olof Larsson 2013-05-17 08:10:46 +02:00
parent 81d79775f8
commit a79577a355
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/massivecraft/factions/entity/UPlayer.java
View File

@ -663,21 +663,6 @@ public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipato
msg("<b>You can't claim more land. You need more power."); msg("<b>You can't claim more land. You need more power.");
return false; return false;
} }
}
if (oldFaction.isNormal())
{
if (!uconf.claimingFromOthersAllowed)
{
msg("<b>You may not claim land from others.");
return false;
}
if (oldFaction.getRelationTo(newFaction).isAtLeast(Rel.TRUCE))
{
msg("<b>You can't claim this land due to your relation with the current owner.");
return false;
}
if if
( (
@ -697,9 +682,24 @@ public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipato
} }
return false; return false;
} }
}
if (oldFaction.isNormal())
{
if (!FPerm.TERRITORY.has(this, oldFaction, false)) if (!FPerm.TERRITORY.has(this, oldFaction, false))
{ {
if (!uconf.claimingFromOthersAllowed)
{
msg("<b>You may not claim land from others.");
return false;
}
if (oldFaction.getRelationTo(newFaction).isAtLeast(Rel.TRUCE))
{
msg("<b>You can't claim this land due to your relation with the current owner.");
return false;
}
if (!oldFaction.hasLandInflation()) if (!oldFaction.hasLandInflation())
{ {
msg("%s<i> owns this land and is strong enough to keep it.", oldFaction.getName(this)); msg("%s<i> owns this land and is strong enough to keep it.", oldFaction.getName(this));