From aa71290381a64fcebbf664b9f0ff8f9cdaadb741 Mon Sep 17 00:00:00 2001 From: SamB440 Date: Mon, 17 Jan 2022 20:32:44 +0000 Subject: [PATCH] Fix Barrier particle for 1.18+ --- .../rpgregions/requirements/PreventType.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/net/islandearth/rpgregions/requirements/PreventType.java b/api/src/main/java/net/islandearth/rpgregions/requirements/PreventType.java index 875ccf0..63312aa 100644 --- a/api/src/main/java/net/islandearth/rpgregions/requirements/PreventType.java +++ b/api/src/main/java/net/islandearth/rpgregions/requirements/PreventType.java @@ -1,6 +1,8 @@ package net.islandearth.rpgregions.requirements; import io.papermc.lib.PaperLib; +import org.bukkit.Bukkit; +import org.bukkit.Material; import org.bukkit.Particle; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerMoveEvent; @@ -18,6 +20,16 @@ public enum PreventType { case PUSH -> player.setVelocity(event.getTo().toVector().subtract(event.getFrom().toVector()).multiply(-3)); case CANCEL -> event.setCancelled(true); } - player.spawnParticle(Particle.BARRIER, event.getTo().getBlock().getLocation().add(0.5, 0.5, 0.5), 1); + + if (getVersionNumber() <= 17) { + player.spawnParticle(Particle.BARRIER, event.getTo().getBlock().getLocation().add(0.5, 0.5, 0.5), 1); + } else { + player.spawnParticle(Particle.valueOf("BLOCK_MARKER"), event.getTo().getBlock().getLocation().add(0.5, 0.5, 0.5), 1, Material.BARRIER.createBlockData()); + } + } + + private int getVersionNumber() { + String[] split = Bukkit.getBukkitVersion().split("-")[0].split("\\."); + return Integer.parseInt(split[1]); } }