From 3c4309200c71bbcee9821b98bec3a5b8d5afcf17 Mon Sep 17 00:00:00 2001 From: Aria Sangarin Date: Thu, 9 Apr 2020 00:26:53 +0200 Subject: [PATCH 1/2] Added exp-curves to the default profession configs --- src/main/resources/default/professions/alchemy.yml | 3 +++ src/main/resources/default/professions/enchanting.yml | 3 +++ src/main/resources/default/professions/farming.yml | 3 +++ src/main/resources/default/professions/fishing.yml | 3 +++ src/main/resources/default/professions/smelting.yml | 5 ++++- src/main/resources/default/professions/smithing.yml | 3 +++ src/main/resources/default/professions/woodcutting.yml | 3 +++ 7 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/resources/default/professions/alchemy.yml b/src/main/resources/default/professions/alchemy.yml index cfc5fa93..a66fa797 100644 --- a/src/main/resources/default/professions/alchemy.yml +++ b/src/main/resources/default/professions/alchemy.yml @@ -8,6 +8,9 @@ experience: base: 20 per-level: 3 +# Must match an existing exp curve filename from the 'expcurves' folder +exp-curve: levels + exp-sources: - 'brewpotion{effect=SPEED}' diff --git a/src/main/resources/default/professions/enchanting.yml b/src/main/resources/default/professions/enchanting.yml index 5edf61d8..4e29021f 100644 --- a/src/main/resources/default/professions/enchanting.yml +++ b/src/main/resources/default/professions/enchanting.yml @@ -8,6 +8,9 @@ experience: base: 10 per-level: 2 +# Must match an existing exp curve filename from the 'expcurves' folder +exp-curve: levels + # Remove the 'enchant' parameter from the line config # to make the profession get EXP with ANY enchant. diff --git a/src/main/resources/default/professions/farming.yml b/src/main/resources/default/professions/farming.yml index bb66ec5f..e2011827 100644 --- a/src/main/resources/default/professions/farming.yml +++ b/src/main/resources/default/professions/farming.yml @@ -8,6 +8,9 @@ experience: base: 10 per-level: 2 +# Must match an existing exp curve filename from the 'expcurves' folder +exp-curve: levels + exp-sources: - 'mineblock{type=CARROTS;amount=1-3;crop=true;player-placed:true}' - 'mineblock{type=POTATOES;amount=1-3;crop=true;player-placed:true}' diff --git a/src/main/resources/default/professions/fishing.yml b/src/main/resources/default/professions/fishing.yml index 6c271a4a..c26e6a6a 100644 --- a/src/main/resources/default/professions/fishing.yml +++ b/src/main/resources/default/professions/fishing.yml @@ -8,6 +8,9 @@ experience: base: 20 per-level: 3 +# Must match an existing exp curve filename from the 'expcurves' folder +exp-curve: levels + exp-sources: {} # Fishing drop tables which override MC default. diff --git a/src/main/resources/default/professions/smelting.yml b/src/main/resources/default/professions/smelting.yml index 348a0ebf..4a1c7268 100644 --- a/src/main/resources/default/professions/smelting.yml +++ b/src/main/resources/default/professions/smelting.yml @@ -6,4 +6,7 @@ name: Smelting # when leveling up this profession experience: base: 20 - per-level: 3 \ No newline at end of file + per-level: 3 + +# Must match an existing exp curve filename from the 'expcurves' folder +exp-curve: levels \ No newline at end of file diff --git a/src/main/resources/default/professions/smithing.yml b/src/main/resources/default/professions/smithing.yml index 8736903c..721d14db 100644 --- a/src/main/resources/default/professions/smithing.yml +++ b/src/main/resources/default/professions/smithing.yml @@ -8,6 +8,9 @@ experience: base: 20 per-level: 3 +# Must match an existing exp curve filename from the 'expcurves' folder +exp-curve: levels + exp-sources: - 'repairitem{}' diff --git a/src/main/resources/default/professions/woodcutting.yml b/src/main/resources/default/professions/woodcutting.yml index 11d592ef..a80bd226 100644 --- a/src/main/resources/default/professions/woodcutting.yml +++ b/src/main/resources/default/professions/woodcutting.yml @@ -8,6 +8,9 @@ experience: base: 13 per-level: 2.5 +# Must match an existing exp curve filename from the 'expcurves' folder +exp-curve: levels + exp-sources: - 'mineblock{type=OAK_LOG;amount=1-3}' - 'mineblock{type=SPRUCE_LOG;amount=1-3}' From 58eeea7581b18be210aaf08d9ff3e987cb41beda Mon Sep 17 00:00:00 2001 From: Jules Date: Thu, 9 Apr 2020 11:03:57 +0200 Subject: [PATCH 2/2] !Fixed small args issue with /hideab --- .../mmocore/command/rpg/admin/HideActionBarCommandMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandMap.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandMap.java index 30227577..aa535ee7 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandMap.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandMap.java @@ -20,7 +20,7 @@ public class HideActionBarCommandMap extends CommandEnd { @Override public CommandResult execute(CommandSender sender, String[] args) { - if (args.length < 3) + if (args.length < 4) return CommandResult.THROW_USAGE; Player player = Bukkit.getPlayer(args[2]);