/f vault deny perm fix

This commit is contained in:
Naman 2018-07-11 08:33:43 -05:00
parent 9b211c12ce
commit eb288c5cdc
2 changed files with 5 additions and 1 deletions

View File

@ -85,8 +85,11 @@ public class CmdCreate extends FCommand {
// join event cannot be cancelled or you'll have an empty faction // join event cannot be cancelled or you'll have an empty faction
// finish setting up the FPlayer // finish setting up the FPlayer
fme.setRole(Role.ADMIN);
fme.setFaction(faction); fme.setFaction(faction);
// We should consider adding the role just AFTER joining the faction.
// That way we don't have to mess up deleting more stuff.
// And prevent the user from being returned to NORMAL after deleting his old faction.
fme.setRole(Role.ADMIN);
for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) { for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) {
follower.msg(TL.COMMAND_CREATE_CREATED, fme.describeTo(follower, true), faction.getTag(follower)); follower.msg(TL.COMMAND_CREATE_CREATED, fme.describeTo(follower, true), faction.getTag(follower));

View File

@ -49,6 +49,7 @@ public class CmdVault extends FCommand {
Access access = fme.getFaction().getAccess(fme, PermissableAction.VAULT); Access access = fme.getFaction().getAccess(fme, PermissableAction.VAULT);
if (access.equals(Access.DENY)) { if (access.equals(Access.DENY)) {
fme.msg(TL.GENERIC_NOPERMISSION, "vault"); fme.msg(TL.GENERIC_NOPERMISSION, "vault");
return;
} }
if (fme.isInVault()){ if (fme.isInVault()){