1.9.4
This commit is contained in:
parent
338e4c8a0f
commit
7e2f561e2b
3 changed files with 18 additions and 2 deletions
|
|
@ -144,6 +144,7 @@ public class KitsConfigManager {
|
||||||
config.set("one_time",kit.isOneTime());
|
config.set("one_time",kit.isOneTime());
|
||||||
config.set("auto_armor",kit.isAutoArmor());
|
config.set("auto_armor",kit.isAutoArmor());
|
||||||
config.set("permission_required",kit.isPermissionRequired());
|
config.set("permission_required",kit.isPermissionRequired());
|
||||||
|
config.set("custom_permission",kit.getCustomPermission());
|
||||||
|
|
||||||
KitItemManager kitItemManager = plugin.getKitItemManager();
|
KitItemManager kitItemManager = plugin.getKitItemManager();
|
||||||
int currentPos = 1;
|
int currentPos = 1;
|
||||||
|
|
@ -229,6 +230,7 @@ public class KitsConfigManager {
|
||||||
KitItemManager kitItemManager = plugin.getKitItemManager();
|
KitItemManager kitItemManager = plugin.getKitItemManager();
|
||||||
int cooldown = config.contains(mainPath+"cooldown") ? config.getInt(mainPath+"cooldown") : 0;
|
int cooldown = config.contains(mainPath+"cooldown") ? config.getInt(mainPath+"cooldown") : 0;
|
||||||
boolean permissionRequired = config.contains(mainPath+"permission_required") ? config.getBoolean(mainPath+"permission_required") : false;
|
boolean permissionRequired = config.contains(mainPath+"permission_required") ? config.getBoolean(mainPath+"permission_required") : false;
|
||||||
|
String customPermission = config.contains(mainPath+"custom_permission") ? config.getString(mainPath+"custom_permission") : null;
|
||||||
boolean autoArmor = config.contains(mainPath+"auto_armor") ? config.getBoolean(mainPath+"auto_armor") : false;
|
boolean autoArmor = config.contains(mainPath+"auto_armor") ? config.getBoolean(mainPath+"auto_armor") : false;
|
||||||
boolean oneTime = config.contains(mainPath+"one_time") ? config.getBoolean(mainPath+"one_time") : false;
|
boolean oneTime = config.contains(mainPath+"one_time") ? config.getBoolean(mainPath+"one_time") : false;
|
||||||
|
|
||||||
|
|
@ -269,6 +271,7 @@ public class KitsConfigManager {
|
||||||
kit.setAutoArmor(autoArmor);
|
kit.setAutoArmor(autoArmor);
|
||||||
kit.setOneTime(oneTime);
|
kit.setOneTime(oneTime);
|
||||||
kit.setPermissionRequired(permissionRequired);
|
kit.setPermissionRequired(permissionRequired);
|
||||||
|
kit.setCustomPermission(customPermission);
|
||||||
kit.setItems(items);
|
kit.setItems(items);
|
||||||
kit.setClaimActions(claimActions);
|
kit.setClaimActions(claimActions);
|
||||||
kit.setErrorActions(errorActions);
|
kit.setErrorActions(errorActions);
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ public class Kit {
|
||||||
private String name;
|
private String name;
|
||||||
private int cooldown;
|
private int cooldown;
|
||||||
private boolean permissionRequired;
|
private boolean permissionRequired;
|
||||||
|
private String customPermission;
|
||||||
private boolean oneTime;
|
private boolean oneTime;
|
||||||
private ArrayList<KitItem> items;
|
private ArrayList<KitItem> items;
|
||||||
private ArrayList<KitAction> claimActions;
|
private ArrayList<KitAction> claimActions;
|
||||||
|
|
@ -145,9 +146,21 @@ public class Kit {
|
||||||
this.requirements = requirements;
|
this.requirements = requirements;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getCustomPermission() {
|
||||||
|
return customPermission;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCustomPermission(String customPermission) {
|
||||||
|
this.customPermission = customPermission;
|
||||||
|
}
|
||||||
|
|
||||||
public boolean playerHasPermission(CommandSender player){
|
public boolean playerHasPermission(CommandSender player){
|
||||||
if(permissionRequired){
|
if(permissionRequired){
|
||||||
return PlayerUtils.isPlayerKitsAdmin(player) || player.hasPermission("playerkits.kit."+name);
|
if(customPermission != null){
|
||||||
|
return PlayerUtils.isPlayerKitsAdmin(player) || player.hasPermission(customPermission);
|
||||||
|
}else{
|
||||||
|
return PlayerUtils.isPlayerKitsAdmin(player) || player.hasPermission("playerkits.kit."+name);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
main: pk.ajneb97.PlayerKits2
|
main: pk.ajneb97.PlayerKits2
|
||||||
version: 1.9.3
|
version: 1.9.4
|
||||||
name: PlayerKits2
|
name: PlayerKits2
|
||||||
api-version: 1.13
|
api-version: 1.13
|
||||||
softdepend: [Vault,PlaceholderAPI]
|
softdepend: [Vault,PlaceholderAPI]
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue