Fixed ownerlist command (though not sure just why it was failing as written, I need to investigate further), working on restructuring and fixing ownership handling for block placement/destruction/interaction/usage. Will finish that up in the next day or two.

This commit is contained in:
Brettflan
2011-10-11 20:14:59 -05:00
parent d37a4d6ff7
commit 0326a6e938
4 changed files with 16 additions and 59 deletions

View File

@@ -582,14 +582,8 @@ public class Faction extends Entity
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;
}