From 8cc2e761a04607b389d7b8efd8d838beec5c265a Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 13 May 2021 11:44:49 +0100 Subject: [PATCH 1/4] Added switch hand listener --- .../util/equipevent/TalismanEquipEventListeners.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/equipevent/TalismanEquipEventListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/equipevent/TalismanEquipEventListeners.java index 45afc8c..3c6e0ab 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/equipevent/TalismanEquipEventListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/equipevent/TalismanEquipEventListeners.java @@ -18,6 +18,7 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.event.player.PlayerSwapHandItemsEvent; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; @@ -108,12 +109,17 @@ public class TalismanEquipEventListeners extends PluginDependent implements List //refreshPlayer(event.getPlayer(), itemStack); } - /** + @EventHandler + public void onSwitchHands(@NotNull final PlayerSwapHandItemsEvent event) { + refreshPlayer(event.getPlayer(), event.getPlayer().getInventory().getItemInOffHand()); + } + + /** * Called on inventory click. * * @param event The event to listen for. */ - @EventHandler + @EventHandler public void onInventoryClick(@NotNull final InventoryClickEvent event) { if (!(event.getWhoClicked() instanceof Player)) { return; From 09bfbc2febdfd489818a9efb632847df729a0974 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 13 May 2021 11:45:02 +0100 Subject: [PATCH 2/4] Updated to 3.0.6 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index eb8078c..eaadecd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 3.0.5 +version = 3.0.6 plugin-name = Talismans \ No newline at end of file From fb9d59fad8e1677ac155afcce5ef1f0299d7c8fc Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 16 May 2021 11:30:12 +0100 Subject: [PATCH 3/4] Fixed color of Flame Talisman III --- eco-core/core-plugin/src/main/resources/talismans/flame.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/resources/talismans/flame.yml b/eco-core/core-plugin/src/main/resources/talismans/flame.yml index 4a562f3..80c0a3a 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/flame.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/flame.yml @@ -58,7 +58,7 @@ levels: multiplier: 0.75 3: - name: "&eFlame Talisman III" + name: "&cFlame Talisman III" description: Take 40% less fire damage. obtaining: From fcfd60e4aee59dead4f542be3d55736b78370bc3 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 16 May 2021 11:30:24 +0100 Subject: [PATCH 4/4] Updated to 3.0.7 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index eaadecd..659defc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 3.0.6 +version = 3.0.7 plugin-name = Talismans \ No newline at end of file