adding new stuff

This commit is contained in:
Naman
2018-03-26 16:43:15 -05:00
parent 382f4c4b0c
commit 44b3de91dd
84 changed files with 1830 additions and 481 deletions

View File

@@ -43,7 +43,9 @@ public enum Permission {
MAP("map"),
MAPHEIGHT("mapheight"),
MOD("mod"),
COLEADER("coleader"),
MOD_ANY("mod.any"),
COLEADER_ANY("coleader.any"),
MODIFY_POWER("modifypower"),
MONEY_BALANCE("money.balance"),
MONEY_BALANCE_ANY("money.balance.any"),
@@ -76,6 +78,7 @@ public enum Permission {
STATUS("status"),
STUCK("stuck"),
TAG("tag"),
TNT("tnt"),
TITLE("title"),
TITLE_COLOR("title.color"),
TOGGLE_ALLIANCE_CHAT("togglealliancechat"),
@@ -87,7 +90,14 @@ public enum Permission {
SETWARP("setwarp"),
TOP("top"),
VAULT("vault"),
GETVAULT("getvault"),
SETMAXVAULTS("setmaxvaults"),
RULES("rules"),
CHECKPOINT("checkpoint"),
UPGRADES("upgrades"),
BANNER("banner"),
TPBANNER("tpbanner"),
KILLHOLOS("killholos"),
WARP("warp");
public final String node;

View File

@@ -7,7 +7,6 @@ import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
@@ -216,7 +215,6 @@ public enum Relation implements Permissable {
itemMeta.setDisplayName(displayName);
itemMeta.setLore(lore);
itemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
item.setItemMeta(itemMeta);
return item;

View File

@@ -15,7 +15,8 @@ import java.util.ArrayList;
import java.util.List;
public enum Role implements Permissable {
ADMIN(3, TL.ROLE_ADMIN),
ADMIN(4, TL.ROLE_ADMIN),
COLEADER(3,TL.ROLE_COLEADER),
MODERATOR(2, TL.ROLE_MODERATOR),
NORMAL(1, TL.ROLE_NORMAL),
RECRUIT(0, TL.ROLE_RECRUIT);
@@ -52,6 +53,8 @@ public enum Role implements Permissable {
case 2:
return MODERATOR;
case 3:
return COLEADER;
case 4:
return ADMIN;
}
@@ -62,6 +65,8 @@ public enum Role implements Permissable {
switch (check.toLowerCase()) {
case "admin":
return ADMIN;
case "coleader":
return COLEADER;
case "mod":
case "moderator":
return MODERATOR;
@@ -89,7 +94,9 @@ public enum Role implements Permissable {
if (this == Role.ADMIN) {
return Conf.prefixAdmin;
}
if (this == Role.COLEADER) {
return Conf.prefixCoLeader;
}
if (this == Role.MODERATOR) {
return Conf.prefixMod;
}
@@ -144,4 +151,4 @@ public enum Role implements Permissable {
return string;
}
}
}