From b960904f3b814cf059f0c4b0363c5d05767db4c9 Mon Sep 17 00:00:00 2001 From: Sven65 Date: Sun, 9 Aug 2020 09:01:20 +0200 Subject: [PATCH] Bump version and make it work with chat formatting plugins --- modules/1_10_R1/pom.xml | 2 +- modules/1_11_R1/pom.xml | 2 +- modules/1_12_R1/pom.xml | 2 +- modules/1_13_R1/pom.xml | 2 +- modules/1_13_R2/pom.xml | 2 +- modules/1_14_R1/pom.xml | 2 +- modules/1_15_R1/pom.xml | 2 +- modules/1_16_R1/pom.xml | 2 +- modules/1_8_R1/pom.xml | 2 +- modules/1_8_R2/pom.xml | 2 +- modules/1_8_R3/pom.xml | 2 +- modules/1_9_R1/pom.xml | 2 +- modules/1_9_R2/pom.xml | 2 +- modules/Dist/pom.xml | 2 +- modules/Plugin/pom.xml | 2 +- .../src/main/java/xyz/mackan/Slabbo/GUI/ShopAdminGUI.java | 3 ++- .../src/main/java/xyz/mackan/Slabbo/GUI/ShopCreationGUI.java | 2 +- pom.xml | 2 +- 18 files changed, 19 insertions(+), 18 deletions(-) diff --git a/modules/1_10_R1/pom.xml b/modules/1_10_R1/pom.xml index feaa165..6bb68ec 100644 --- a/modules/1_10_R1/pom.xml +++ b/modules/1_10_R1/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/1_11_R1/pom.xml b/modules/1_11_R1/pom.xml index 327ed15..607536a 100644 --- a/modules/1_11_R1/pom.xml +++ b/modules/1_11_R1/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/1_12_R1/pom.xml b/modules/1_12_R1/pom.xml index 928c5e3..f8f24d2 100644 --- a/modules/1_12_R1/pom.xml +++ b/modules/1_12_R1/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/1_13_R1/pom.xml b/modules/1_13_R1/pom.xml index 524edb4..ec254de 100644 --- a/modules/1_13_R1/pom.xml +++ b/modules/1_13_R1/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/1_13_R2/pom.xml b/modules/1_13_R2/pom.xml index 927f203..90270b4 100644 --- a/modules/1_13_R2/pom.xml +++ b/modules/1_13_R2/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/1_14_R1/pom.xml b/modules/1_14_R1/pom.xml index 4d66a51..691fb2c 100644 --- a/modules/1_14_R1/pom.xml +++ b/modules/1_14_R1/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/1_15_R1/pom.xml b/modules/1_15_R1/pom.xml index 3b117a4..aa84efb 100644 --- a/modules/1_15_R1/pom.xml +++ b/modules/1_15_R1/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/1_16_R1/pom.xml b/modules/1_16_R1/pom.xml index 77466dc..75ec53f 100644 --- a/modules/1_16_R1/pom.xml +++ b/modules/1_16_R1/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/1_8_R1/pom.xml b/modules/1_8_R1/pom.xml index f33723f..c3d304e 100644 --- a/modules/1_8_R1/pom.xml +++ b/modules/1_8_R1/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/1_8_R2/pom.xml b/modules/1_8_R2/pom.xml index 78bf372..42afe31 100644 --- a/modules/1_8_R2/pom.xml +++ b/modules/1_8_R2/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/1_8_R3/pom.xml b/modules/1_8_R3/pom.xml index d12e2c7..fa3f6ff 100644 --- a/modules/1_8_R3/pom.xml +++ b/modules/1_8_R3/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/1_9_R1/pom.xml b/modules/1_9_R1/pom.xml index 0a625eb..76fa07c 100644 --- a/modules/1_9_R1/pom.xml +++ b/modules/1_9_R1/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/1_9_R2/pom.xml b/modules/1_9_R2/pom.xml index 8b6d329..df06b93 100644 --- a/modules/1_9_R2/pom.xml +++ b/modules/1_9_R2/pom.xml @@ -13,7 +13,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/Dist/pom.xml b/modules/Dist/pom.xml index 51e9ad2..e7edb4b 100644 --- a/modules/Dist/pom.xml +++ b/modules/Dist/pom.xml @@ -12,7 +12,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 ../../ diff --git a/modules/Plugin/pom.xml b/modules/Plugin/pom.xml index 1c08a88..960622e 100644 --- a/modules/Plugin/pom.xml +++ b/modules/Plugin/pom.xml @@ -12,7 +12,7 @@ Slabbo-parent xyz.mackan - 1.0.13 + 1.0.14 ../../ diff --git a/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopAdminGUI.java b/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopAdminGUI.java index 9cf025c..2bb9981 100644 --- a/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopAdminGUI.java +++ b/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopAdminGUI.java @@ -5,6 +5,7 @@ import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; @@ -314,7 +315,7 @@ public void onInventoryClick(final InventoryDragEvent e) { } } - @EventHandler + @EventHandler(priority = EventPriority.LOWEST) public void onChat (final AsyncPlayerChatEvent e) { if (!e.getPlayer().getUniqueId().equals(waitingPlayerId)) return; diff --git a/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopCreationGUI.java b/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopCreationGUI.java index 06a0f61..5a0f8b1 100644 --- a/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopCreationGUI.java +++ b/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopCreationGUI.java @@ -262,7 +262,7 @@ public void onInventoryClick(final InventoryDragEvent e) { } } - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.LOWEST) public void onChat (final AsyncPlayerChatEvent e) { if (!e.getPlayer().getUniqueId().equals(waitingPlayerId)) return; diff --git a/pom.xml b/pom.xml index 3480f16..a2838ee 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ xyz.mackan Slabbo-parent - 1.0.13 + 1.0.14 pom Slabbo