SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.6.x' into 1.6.x

Browse Source 
# Conflicts:
#	src/main/java/com/massivecraft/factions/zcore/fperms/DefaultPermissions.java
This commit is contained in:
Driftay 2019-07-19 18:54:38 -04:00
commit 1d2371acab
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/massivecraft/factions/zcore/fperms/DefaultPermissions.java
View File

@ -135,7 +135,7 @@ public class DefaultPermissions {
else if (name == "sethome") return this.sethome; else if (name == "sethome") return this.sethome;
else if (name == "territory") return this.territory; else if (name == "territory") return this.territory;
else if (name == "access") return this.access; else if (name == "access") return this.access;
else if (name == "home") return this.home; else if (name == "home") return this.disband;
else if (name == "disband") return this.disband; else if (name == "disband") return this.disband;
else if (name == "promote") return this.promote; else if (name == "promote") return this.promote;
else if (name == "setwarp") return this.setwarp; else if (name == "setwarp") return this.setwarp;