TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-11-01 01:42:18 +00:00
Code Issues Projects Releases Wiki Activity

add ally to factionframework buildable

Browse source
This commit is contained in:
PhanaticD 2018-12-29 10:06:01 -05:00
parent 3cbb81f0ec
commit 5a5355f5ed
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/projectkorra/projectkorra/GeneralMethods.java
View file

@ -44,6 +44,7 @@ import me.markeh.factionsframework.entities.FPlayer;
import me.markeh.factionsframework.entities.FPlayers;
import me.markeh.factionsframework.entities.Faction;
import me.markeh.factionsframework.entities.Factions;
import me.markeh.factionsframework.enums.Rel;
import me.ryanhamshire.GriefPrevention.Claim;
import me.ryanhamshire.GriefPrevention.GriefPrevention;
import net.md_5.bungee.api.chat.ClickEvent;
@ -1430,8 +1431,9 @@ public class GeneralMethods {
if (facsfw != null && respectFactions) {
FPlayer fPlayer = FPlayers.getBySender(player);
Faction faction = Factions.getFactionAt(location);
Rel relation = fPlayer.getRelationTo(faction);
return !(faction.isNone() || fPlayer.getFaction().equals(faction));
return !(faction.isNone() || fPlayer.getFaction().equals(faction) || relation == Rel.ALLY);
}
if (twnp != null && respectTowny) {