From 35975510bda293ab4650e31b42758e977e7edcde Mon Sep 17 00:00:00 2001 From: Loving11ish Date: Thu, 7 Mar 2024 21:02:45 +0000 Subject: [PATCH 1/5] Added new kit price bypass permission `playerkits.bypass.cost`. --- src/main/java/pk/ajneb97/managers/KitsManager.java | 7 ++++--- src/main/java/pk/ajneb97/utils/PlayerUtils.java | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/pk/ajneb97/managers/KitsManager.java b/src/main/java/pk/ajneb97/managers/KitsManager.java index 9162461..2f2bc0d 100644 --- a/src/main/java/pk/ajneb97/managers/KitsManager.java +++ b/src/main/java/pk/ajneb97/managers/KitsManager.java @@ -191,7 +191,8 @@ public PlayerKitsMessageResult giveKit(Player player, String kitName, GiveKitIns //Requirements - Buy KitRequirements kitRequirements = kit.getRequirements(); if(!giveKitInstructions.isIgnoreRequirements() && kitRequirements != null && - (kitRequirements.getPrice() != 0 || !kitRequirements.getExtraRequirements().isEmpty())){ + (kitRequirements.getPrice() != 0 || !kitRequirements.getExtraRequirements().isEmpty()) + && !PlayerUtils.hasCostBypassPermission(player)){ if(!(kitRequirements.isOneTimeRequirements() && playerDataManager.isKitBought(player,kit.getName()))){ if(!giveKitInstructions.isRequirementsSatisfied()){ //Player must buy it first @@ -328,7 +329,7 @@ public PlayerKitsMessageResult giveKit(Player player, String kitName, GiveKitIns //Requirements - Buy KitRequirements kitRequirements = kit.getRequirements(); - if(!giveKitInstructions.isIgnoreRequirements() && kitRequirements != null && giveKitInstructions.isRequirementsSatisfied()){ + if(!giveKitInstructions.isIgnoreRequirements() && kitRequirements != null && giveKitInstructions.isRequirementsSatisfied() && !PlayerUtils.hasCostBypassPermission(player)){ //Check price and update balance double price = kitRequirements.getPrice(); Economy economy = plugin.getDependencyManager().getVaultEconomy(); @@ -404,7 +405,7 @@ public boolean passPrice(double price,Player player){ if(price != 0){ Economy economy = plugin.getDependencyManager().getVaultEconomy(); if(economy != null){ - if(economy.getBalance(player) < price){ + if(economy.getBalance(player) < price && !PlayerUtils.hasCostBypassPermission(player)){ return false; } } diff --git a/src/main/java/pk/ajneb97/utils/PlayerUtils.java b/src/main/java/pk/ajneb97/utils/PlayerUtils.java index f167a1f..a4ef66d 100644 --- a/src/main/java/pk/ajneb97/utils/PlayerUtils.java +++ b/src/main/java/pk/ajneb97/utils/PlayerUtils.java @@ -56,6 +56,10 @@ public static boolean hasOneTimeBypassPermission(CommandSender sender){ return sender.hasPermission("playerkits.bypass.onetime"); } + public static boolean hasCostBypassPermission(CommandSender sender){ + return sender.hasPermission("playerkits.bypass.cost"); + } + public static boolean passCondition(Player player,String condition) { String[] sep = condition.split(" "); String variable = sep[0]; From e1cb0d59761981ac9b49eccc566faba21fcb3b24 Mon Sep 17 00:00:00 2001 From: Loving11ish Date: Thu, 7 Mar 2024 21:23:49 +0000 Subject: [PATCH 2/5] Altered new kit price bypass permission `playerkits.bypass.cost.` to now be per kit. --- .../java/pk/ajneb97/managers/KitsManager.java | 21 +++++++++++++++---- .../java/pk/ajneb97/utils/PlayerUtils.java | 4 ++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/java/pk/ajneb97/managers/KitsManager.java b/src/main/java/pk/ajneb97/managers/KitsManager.java index 2f2bc0d..fb3ff65 100644 --- a/src/main/java/pk/ajneb97/managers/KitsManager.java +++ b/src/main/java/pk/ajneb97/managers/KitsManager.java @@ -192,7 +192,7 @@ public PlayerKitsMessageResult giveKit(Player player, String kitName, GiveKitIns KitRequirements kitRequirements = kit.getRequirements(); if(!giveKitInstructions.isIgnoreRequirements() && kitRequirements != null && (kitRequirements.getPrice() != 0 || !kitRequirements.getExtraRequirements().isEmpty()) - && !PlayerUtils.hasCostBypassPermission(player)){ + && !PlayerUtils.hasCostBypassPermission(player, kitName)){ if(!(kitRequirements.isOneTimeRequirements() && playerDataManager.isKitBought(player,kit.getName()))){ if(!giveKitInstructions.isRequirementsSatisfied()){ //Player must buy it first @@ -202,7 +202,7 @@ public PlayerKitsMessageResult giveKit(Player player, String kitName, GiveKitIns } //Check price - if(!passPrice(kitRequirements.getPrice(),player)){ + if(!passPrice(kitRequirements.getPrice(),player, kitName)){ sendKitActions(kit.getErrorActions(),player,false); return PlayerKitsMessageResult.error(messagesFile.getString("requirementsError")); } @@ -329,7 +329,8 @@ public PlayerKitsMessageResult giveKit(Player player, String kitName, GiveKitIns //Requirements - Buy KitRequirements kitRequirements = kit.getRequirements(); - if(!giveKitInstructions.isIgnoreRequirements() && kitRequirements != null && giveKitInstructions.isRequirementsSatisfied() && !PlayerUtils.hasCostBypassPermission(player)){ + if(!giveKitInstructions.isIgnoreRequirements() && kitRequirements != null && giveKitInstructions.isRequirementsSatisfied() + && !PlayerUtils.hasCostBypassPermission(player, kitName)){ //Check price and update balance double price = kitRequirements.getPrice(); Economy economy = plugin.getDependencyManager().getVaultEconomy(); @@ -405,7 +406,19 @@ public boolean passPrice(double price,Player player){ if(price != 0){ Economy economy = plugin.getDependencyManager().getVaultEconomy(); if(economy != null){ - if(economy.getBalance(player) < price && !PlayerUtils.hasCostBypassPermission(player)){ + if(economy.getBalance(player) < price){ + return false; + } + } + } + return true; + } + + public boolean passPrice(double price,Player player, String kitName){ + if(price != 0){ + Economy economy = plugin.getDependencyManager().getVaultEconomy(); + if(economy != null){ + if(economy.getBalance(player) < price && !PlayerUtils.hasCostBypassPermission(player, kitName)){ return false; } } diff --git a/src/main/java/pk/ajneb97/utils/PlayerUtils.java b/src/main/java/pk/ajneb97/utils/PlayerUtils.java index a4ef66d..dba5168 100644 --- a/src/main/java/pk/ajneb97/utils/PlayerUtils.java +++ b/src/main/java/pk/ajneb97/utils/PlayerUtils.java @@ -56,8 +56,8 @@ public static boolean hasOneTimeBypassPermission(CommandSender sender){ return sender.hasPermission("playerkits.bypass.onetime"); } - public static boolean hasCostBypassPermission(CommandSender sender){ - return sender.hasPermission("playerkits.bypass.cost"); + public static boolean hasCostBypassPermission(CommandSender sender, String kitName){ + return sender.hasPermission("playerkits.bypass.cost." + kitName); } public static boolean passCondition(Player player,String condition) { From 576aefae5714f29e5b5643824057e9e77093689f Mon Sep 17 00:00:00 2001 From: Loving11ish Date: Tue, 4 Jun 2024 17:18:57 +0100 Subject: [PATCH 3/5] Updated to follow remote master. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 77cd1b9..9761a1b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pk.ajneb97 PlayerKits2 - 1.0-SNAPSHOT + 1.0.1-SNAPSHOT 21 From 450c08aa82f5378604a0904f140b3393b6c0c3ae Mon Sep 17 00:00:00 2001 From: Loving11ish Date: Tue, 13 Aug 2024 16:43:02 +0100 Subject: [PATCH 4/5] Updated to follow remote master. Changed version to `1.0.2-SNAPSHOT`. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9761a1b..5d739ca 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pk.ajneb97 PlayerKits2 - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT 21 From fb2e8891aabc0eee6679a568059d1c5224d643cb Mon Sep 17 00:00:00 2001 From: Loving11ish Date: Wed, 2 Oct 2024 01:06:49 +0100 Subject: [PATCH 5/5] Updated to follow remote master. Changed version to `1.0.3-SNAPSHOT`. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d739ca..927449b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pk.ajneb97 PlayerKits2 - 1.0.2-SNAPSHOT + 1.0.3-SNAPSHOT 21