diff --git a/build.gradle.kts b/build.gradle.kts index 573db37..e0fb6a5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { allprojects { project.group = "net.momirealms" - project.version = "3.4.0.6" + project.version = "3.4.0.7" apply() apply(plugin = "java") diff --git a/plugin/src/main/java/net/momirealms/customcrops/mechanic/action/ActionManagerImpl.java b/plugin/src/main/java/net/momirealms/customcrops/mechanic/action/ActionManagerImpl.java index 317202a..6291de2 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/mechanic/action/ActionManagerImpl.java +++ b/plugin/src/main/java/net/momirealms/customcrops/mechanic/action/ActionManagerImpl.java @@ -17,6 +17,8 @@ package net.momirealms.customcrops.mechanic.action; +import com.comphenix.protocol.PacketType; +import com.comphenix.protocol.events.PacketContainer; import net.kyori.adventure.key.Key; import net.kyori.adventure.sound.Sound; import net.kyori.adventure.text.Component; @@ -49,6 +51,7 @@ import net.momirealms.customcrops.api.util.LogUtils; import net.momirealms.customcrops.compatibility.VaultHook; import net.momirealms.customcrops.manager.AdventureManagerImpl; import net.momirealms.customcrops.manager.HologramManager; +import net.momirealms.customcrops.manager.PacketManager; import net.momirealms.customcrops.mechanic.item.impl.VariationCrop; import net.momirealms.customcrops.mechanic.misc.TempFakeItem; import net.momirealms.customcrops.mechanic.world.block.MemoryCrop; @@ -427,7 +430,10 @@ public class ActionManagerImpl implements ActionManager { return state -> { if (Math.random() > chance) return; if (state.getPlayer() == null) return; - state.getPlayer().swingHand(arg ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND); + PacketContainer animationPacket = new PacketContainer(PacketType.Play.Server.ANIMATION); + animationPacket.getIntegers().write(0, state.getPlayer().getEntityId()); + animationPacket.getIntegers().write(1, arg ? 0 : 3); + PacketManager.getInstance().send(state.getPlayer(), animationPacket); }; }); } diff --git a/plugin/src/main/java/net/momirealms/customcrops/mechanic/item/custom/itemsadder/ItemsAdderProvider.java b/plugin/src/main/java/net/momirealms/customcrops/mechanic/item/custom/itemsadder/ItemsAdderProvider.java index f616521..d008c99 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/mechanic/item/custom/itemsadder/ItemsAdderProvider.java +++ b/plugin/src/main/java/net/momirealms/customcrops/mechanic/item/custom/itemsadder/ItemsAdderProvider.java @@ -89,6 +89,7 @@ public class ItemsAdderProvider implements CustomProvider { @Override public ItemStack getItemStack(String id) { + if (id == null) return new ItemStack(Material.AIR); CustomStack customStack = CustomStack.getInstance(id); if (customStack == null) { return null; diff --git a/plugin/src/main/java/net/momirealms/customcrops/mechanic/item/custom/oraxen/OraxenProvider.java b/plugin/src/main/java/net/momirealms/customcrops/mechanic/item/custom/oraxen/OraxenProvider.java index 77b577f..11f0fa4 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/mechanic/item/custom/oraxen/OraxenProvider.java +++ b/plugin/src/main/java/net/momirealms/customcrops/mechanic/item/custom/oraxen/OraxenProvider.java @@ -41,7 +41,7 @@ public class OraxenProvider implements CustomProvider { if (block.getType() == Material.AIR) { return false; } - if (OraxenBlocks.remove(location, null, false)) { + if (!OraxenBlocks.remove(location, null, false)) { block.setType(Material.AIR); } return true; @@ -88,6 +88,7 @@ public class OraxenProvider implements CustomProvider { @Override public ItemStack getItemStack(String id) { + if (id == null) return new ItemStack(Material.AIR); ItemBuilder builder = OraxenItems.getItemById(id); if (builder == null) { return null;