From b2987371f8f9b0df574e1cd7b40b9f1e8e64e9d0 Mon Sep 17 00:00:00 2001 From: Indyuce Date: Tue, 11 Oct 2022 23:54:16 +0200 Subject: [PATCH] Reverted changes --- .../loot/chest/particle/CastingParticle.java | 16 +++++----------- .../Indyuce/mmocore/listener/PlayerListener.java | 4 +--- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/loot/chest/particle/CastingParticle.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/loot/chest/particle/CastingParticle.java index 24bd3827..3ccf2eb7 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/loot/chest/particle/CastingParticle.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/loot/chest/particle/CastingParticle.java @@ -1,7 +1,5 @@ package net.Indyuce.mmocore.loot.chest.particle; -import java.util.function.Consumer; - import org.apache.commons.lang.Validate; import org.bukkit.Color; import org.bukkit.Location; @@ -9,6 +7,8 @@ import org.bukkit.Material; import org.bukkit.Particle; import org.bukkit.configuration.ConfigurationSection; +import java.util.function.Consumer; + public class CastingParticle { private final Consumer display; @@ -22,8 +22,7 @@ public class CastingParticle { if (config.contains("color")) { final float size = (float) config.getDouble("size") == 0 ? 1 : (float) Math.max(config.getDouble("size"), 0); Color color = Color.fromRGB(config.getInt("color.red"), config.getInt("color.green"), config.getInt("color.blue")); - - display = (loc) -> loc.getWorld().spawnParticle(particle, loc, 1, new Particle.DustOptions(color, size)); + display = loc -> loc.getWorld().spawnParticle(particle, loc, 1, new Particle.DustOptions(color, size)); return; } @@ -31,16 +30,11 @@ public class CastingParticle { format = config.getString("material"); Validate.notNull(format, "Could not read material name"); Material material = Material.valueOf(format.toUpperCase().replace("-", "_").replace(" ", "_")); - if (material == Material.DIRT && particle == Particle.SUSPENDED) - display = (loc) -> { - return; - }; - else - display = (loc) -> loc.getWorld().spawnParticle(particle, loc, 1, material.createBlockData()); + display = loc -> loc.getWorld().spawnParticle(particle, loc, 1, material.createBlockData()); return; } - display = (loc) -> loc.getWorld().spawnParticle(particle, loc, 0); + display = loc -> loc.getWorld().spawnParticle(particle, loc, 0); } public CastingParticle(Particle particle) { diff --git a/MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java b/MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java index c3f53116..e3b84d64 100644 --- a/MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java +++ b/MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java @@ -38,12 +38,10 @@ public class PlayerListener implements Listener { // Register custom inventory clicks @EventHandler public void b(InventoryClickEvent event) { - if (event.getInventory().getHolder() instanceof PluginInventory) { - event.setCancelled(true); + if (event.getInventory().getHolder() instanceof PluginInventory) if (event.getCurrentItem() != null && event.getCurrentItem().getItemMeta() != null) ((PluginInventory) event.getInventory().getHolder()) .whenClicked(new InventoryClickContext(event.getRawSlot(), event.getCurrentItem(), event.getClick(), event, event.getInventory())); - } } // Register custom inventory close effect