From 81031d3acc0c00211bf3821772632d60b942cf3e Mon Sep 17 00:00:00 2001 From: MisterErwin Date: Tue, 4 Sep 2018 19:04:27 +0200 Subject: [PATCH] Using spigot Particles and BlockData Directional --- .../Slimefun/api/item_transport/CargoNet.java | 14 +++----------- .../Slimefun/api/network/Network.java | 4 ++-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java b/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java index fd9ba00b1..1ddcad3e6 100644 --- a/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java +++ b/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java @@ -15,6 +15,7 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; +import org.bukkit.block.data.Directional; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; @@ -538,17 +539,8 @@ public class CargoNet extends Network { @SuppressWarnings("deprecation") private static Block getAttachedBlock(Block block) { - if (block.getData() == 2) { - return block.getRelative(BlockFace.SOUTH); - } - else if (block.getData() == 3) { - return block.getRelative(BlockFace.NORTH); - } - else if (block.getData() == 4) { - return block.getRelative(BlockFace.EAST); - } - else if (block.getData() == 5) { - return block.getRelative(BlockFace.WEST); + if (block.getBlockData() instanceof Directional) { + return block.getRelative(((Directional) block.getBlockData()).getFacing().getOppositeFace()); } return null; } diff --git a/src/me/mrCookieSlime/Slimefun/api/network/Network.java b/src/me/mrCookieSlime/Slimefun/api/network/Network.java index d91126e86..ae26c2e4f 100644 --- a/src/me/mrCookieSlime/Slimefun/api/network/Network.java +++ b/src/me/mrCookieSlime/Slimefun/api/network/Network.java @@ -9,8 +9,8 @@ import java.util.ArrayList; import org.bukkit.Location; -import me.mrCookieSlime.CSCoreLibPlugin.general.Particles.MC_1_8.ParticleEffect; import me.mrCookieSlime.Slimefun.SlimefunStartup; +import org.bukkit.Particle; public abstract class Network { private static List NETWORK_LIST = new ArrayList(); @@ -157,7 +157,7 @@ public abstract class Network { public void run() { for(Location l: connectedLocations) { try { - ParticleEffect.REDSTONE.display(l.clone().add(0.5, 0.5, 0.5), 0, 0, 0, 0, 1); + l.getWorld().spawnParticle(Particle.REDSTONE, l.clone().add(0.5, 0.5, 0.5), 1); } catch(Exception e) { }