Make the Faction Permissions more dynamic as well.

This commit is contained in:
Olof Larsson
2014-10-02 14:02:07 +02:00
parent 670d8e4a5f
commit 422c896631
28 changed files with 650 additions and 448 deletions

View File

@@ -4,8 +4,8 @@ import java.util.HashSet;
import java.util.Set;
import com.massivecraft.factions.EconomyParticipator;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.util.RelationUtil;
@@ -88,8 +88,8 @@ public class Econ
// Factions can be controlled by those that have permissions
if (you instanceof Faction)
{
if (i instanceof Faction && FPerm.WITHDRAW.has((Faction)i, fYou)) return true;
if (i instanceof MPlayer && FPerm.WITHDRAW.has((MPlayer)i, fYou, false)) return true;
if (i instanceof Faction && MPerm.getWithdraw().has((Faction)i, fYou)) return true;
if (i instanceof MPlayer && MPerm.getWithdraw().has((MPlayer)i, fYou, false)) return true;
}
// Otherwise you may not! ;,,;