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

/f unclaim fix

Browse Source
This commit is contained in:
ProSavage 2018-07-22 11:33:53 -05:00
parent c5f06f910a
commit df9506ca9c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java
View File

@ -130,15 +130,17 @@ public class CmdUnclaim extends FCommand {
} }
if (targetFaction.getAccess(fme,PermissableAction.TERRITORY) == Access.DENY) { if (targetFaction.getAccess(fme,PermissableAction.TERRITORY) == Access.DENY) {
return false; return false;
} }
if (!assertHasFaction()) { if (!assertHasFaction()) {
return false; return false;
} }
if (targetFaction.getAccess(fme,PermissableAction.TERRITORY) != Access.ALLOW || !assertMinRole(Role.MODERATOR)) { if (targetFaction.getAccess(fme, PermissableAction.TERRITORY) != Access.ALLOW && !assertMinRole(Role.MODERATOR)) {
return false; return false;
} }
@ -148,6 +150,7 @@ public class CmdUnclaim extends FCommand {
return false; return false;
} }
LandUnclaimEvent unclaimEvent = new LandUnclaimEvent(target, targetFaction, fme); LandUnclaimEvent unclaimEvent = new LandUnclaimEvent(target, targetFaction, fme);
Bukkit.getServer().getPluginManager().callEvent(unclaimEvent); Bukkit.getServer().getPluginManager().callEvent(unclaimEvent);
if (unclaimEvent.isCancelled()) { if (unclaimEvent.isCancelled()) {

2
src/main/resources/plugin.yml
View File

@ -1,5 +1,5 @@
name: Factions name: Factions
version: ${project.version}-1.4-BETA-4 version: ${project.version}-1.4-BETA-5
main: com.massivecraft.factions.P main: com.massivecraft.factions.P
authors: [Olof Larsson, Brett Flannigan, drtshock, ProSavage] authors: [Olof Larsson, Brett Flannigan, drtshock, ProSavage]
softdepend: [CoreProtect, PlayerVaults, PlaceholderAPI, MVdWPlaceholderAPI, PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, CAPI, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag, dynmap, FactionsTop] softdepend: [CoreProtect, PlayerVaults, PlaceholderAPI, MVdWPlaceholderAPI, PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, CAPI, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag, dynmap, FactionsTop]