fix: made unable to trade if other is trading and bump v1.2

okocraft · Nov 3, 2022 · 421c73d · 421c73d
1 parent a066dfe
commit 421c73d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "net.okocraft.boxtradestick"
-version = "1.1"
+version = "1.2"
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/net/okocraft/boxtradestick/PlayerListener.java b/src/main/java/net/okocraft/boxtradestick/PlayerListener.java
@@ -15,6 +15,7 @@
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.inventory.EquipmentSlot;
 
 public class PlayerListener implements Listener {
 
@@ -54,7 +55,9 @@ public void onPlayerAttackVillager(EntityDamageByEntityEvent event) {
         }
         onEntityDamageByEntityEvent = false;
 
-        NMSUtil.startTrading(villager, player);
+        if (!NMSUtil.simulateMobInteract(player, villager, EquipmentSlot.HAND)) {
+            return;
+        }
 
         MerchantRecipesGUI gui = new MerchantRecipesGUI(player, villager);
         int selectedOfferIndex = gui.getCurrentSelected();