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

Merged some changes

Browse Source
This commit is contained in:
Olof Larsson
2011-10-12 17:28:00 +02:00
parent b202acb685 0326a6e938
commit 2566edfd8c
4 changed files with 12 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/massivecraft/factions/Faction.java
View File

@@ -621,14 +621,8 @@ public class Faction extends Entity implements EconomyParticipator
public boolean playerHasOwnershipRights(FPlayer fplayer, FLocation loc)
{
// different faction?
if (fplayer.getFactionId() != this.getId())
{
return false;
}
// sufficient role to bypass ownership?
if (fplayer.getRole().isAtLeast(Conf.ownedAreaModeratorsBypass ? Role.MODERATOR : Role.ADMIN))
if (fplayer.getFaction() == this && fplayer.getRole().isAtLeast(Conf.ownedAreaModeratorsBypass ? Role.MODERATOR : Role.ADMIN))
{
return true;
}