Skip to content

Commit a778af7

Browse files
committed
Fixed sound playing on interact anywhere
1 parent 14a26ba commit a778af7

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/main/java/com/toonystank/armorswap/Events/ClickEvent.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.bukkit.event.EventHandler;
1212
import org.bukkit.event.EventPriority;
1313
import org.bukkit.event.Listener;
14+
import org.bukkit.event.inventory.InventoryClickEvent;
1415
import org.bukkit.event.player.PlayerInteractAtEntityEvent;
1516
import org.bukkit.event.player.PlayerInteractEntityEvent;
1617
import org.bukkit.event.player.PlayerInteractEvent;
@@ -54,6 +55,7 @@ public void onArmorStandRightClickEvent(PlayerInteractAtEntityEvent event) {
5455

5556
Entity entity = event.getRightClicked();
5657

58+
5759
if (!entity.getType().equals(EntityType.ARMOR_STAND)) return;
5860

5961
event.setCancelled(true);
@@ -119,7 +121,6 @@ void standWithHand(Player player, ArmorStand stand) {
119121
stand.getEquipment().setItemInMainHand(itemStack);
120122
}
121123
}
122-
123124
//
124125
// ARMOR STAND EVENT ENDS HERE
125126
//
@@ -187,6 +188,7 @@ public void giveItem(ItemStack playerItem, ItemStack itemOnFrame, ItemFrame clic
187188
public void onArmorRightClickEvent(PlayerInteractEvent event) {
188189
if (mainHandSwap) {
189190
Player player = event.getPlayer();
191+
if (player.getInventory().getItemInMainHand().getType().isAir()) return;
190192
int value = getArmorSwapEnabled(player);
191193
if (value == 1) {
192194
Block block = event.getClickedBlock();

0 commit comments

Comments
 (0)