diff --git a/plugin.yml b/plugin.yml index 99fffec6..9380638a 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,5 +1,4 @@ main: ${project.groupId}.${project.name} -main: ${project.groupId}.${project.name} name: ${project.name} version: ${project.version} website: ${project.url} @@ -64,7 +63,7 @@ permissions: factions.perm.list: {description: list perms, default: false} factions.perm.set: {description: set perms, default: false} factions.perm.show: {description: show who has perm, default: false} - factions.perm.show2: {description: show perms given to, default: false} + factions.perm.view: {description: view perms given to, default: false} factions.player: {description: show player information} factions.powerboost: {description: manage powerboost, default: false} factions.powerboost.faction: {description: show faction powerboost, default: false} @@ -163,7 +162,7 @@ permissions: factions.perm.list: true factions.perm.set: true factions.perm.show: true - factions.perm.show2: true + factions.perm.view: true factions.player: true factions.powerboost: true factions.powerboost.faction: true @@ -285,7 +284,7 @@ permissions: factions.perm.list: true factions.perm.set: true factions.perm.show: true - factions.perm.show2: true + factions.perm.view: true factions.player: true factions.promote: true factions.powerboost: true diff --git a/src/com/massivecraft/factions/Perm.java b/src/com/massivecraft/factions/Perm.java index 6aa9881f..7a5f6abb 100644 --- a/src/com/massivecraft/factions/Perm.java +++ b/src/com/massivecraft/factions/Perm.java @@ -58,7 +58,7 @@ public enum Perm implements Identified PERM_LIST, PERM_SET, PERM_SHOW, - PERM_SHOW2, + PERM_VIEW, PLAYER, POWERBOOST, POWERBOOST_PLAYER, diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java b/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java index 689fec9a..f25ef7a8 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java @@ -8,7 +8,7 @@ public class CmdFactionsPerm extends FactionsCommand CmdFactionsPermList cmdFactionsPermList = new CmdFactionsPermList(); CmdFactionsPermShow cmdFactionsPermShow = new CmdFactionsPermShow(); - CmdFactionsPermShow2 cmdFactionsPermShow2 = new CmdFactionsPermShow2(); + CmdFactionsPermView cmdFactionsPermView = new CmdFactionsPermView(); CmdFactionsPermSet cmdFactionsPermSet = new CmdFactionsPermSet(); } diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPermShow2.java b/src/com/massivecraft/factions/cmd/CmdFactionsPermView.java similarity index 97% rename from src/com/massivecraft/factions/cmd/CmdFactionsPermShow2.java rename to src/com/massivecraft/factions/cmd/CmdFactionsPermView.java index 9ed2f17d..d1397f74 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPermShow2.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPermView.java @@ -15,13 +15,13 @@ import org.bukkit.ChatColor; import java.util.stream.Collectors; -public class CmdFactionsPermShow2 extends FactionsCommand +public class CmdFactionsPermView extends FactionsCommand { // -------------------------------------------- // // CONSTRUCT // -------------------------------------------- // - public CmdFactionsPermShow2() + public CmdFactionsPermView() { // Parameters this.addParameter(TypeMPermable.get(), "rank/rel/player/faction");