diff --git a/api/src/main/java/lol/pyr/znpcsplus/api/npc/Npc.java b/api/src/main/java/lol/pyr/znpcsplus/api/npc/Npc.java index 1c25a8d..740a2f3 100644 --- a/api/src/main/java/lol/pyr/znpcsplus/api/npc/Npc.java +++ b/api/src/main/java/lol/pyr/znpcsplus/api/npc/Npc.java @@ -100,6 +100,28 @@ public interface Npc extends PropertyHolder { */ void respawn(Player player); + /** + * Blacklists a player from sending packets for this NPC + * This means that the run task won't send packets to the player + * + * @param player The player to be blacklisted + */ + void blacklist(Player player); + + /** + * Removes a player from the blacklist, allowing packets to be sent to them for this NPC. + * + * @param player The player to be removed from the blacklist + */ + void unblacklist(Player player); + + /** + * Gets if a player is blacklisted from sending packets for this NPC + * @param player The player to check + * @return If the player is blacklisted + */ + boolean isBlacklisted(Player player); + /** * Sets the head rotation of this NPC for a player * @param player The {@link Player} to set the head rotation for diff --git a/plugin/build.gradle b/plugin/build.gradle index f8f5ae6..1c7baa0 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -20,7 +20,7 @@ dependencies { compileOnly "com.google.code.gson:gson:2.10.1" // JSON parsing compileOnly "org.bstats:bstats-bukkit:3.0.2" // Plugin stats compileOnly "me.robertlit:SpigotResourcesAPI:2.0" // Spigot API wrapper for update checker - compileOnly "com.github.retrooper.packetevents:spigot:2.1.0" // Packets + compileOnly "com.github.retrooper.packetevents:spigot:2.2.0" // Packets compileOnly "space.arim.dazzleconf:dazzleconf-ext-snakeyaml:1.2.1" // Configs compileOnly "lol.pyr:director-adventure:2.1.1" // Commands diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java b/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java index f5dc5c1..eb5a25c 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java @@ -54,8 +54,8 @@ public class ZNpcsPlusBootstrap extends JavaPlugin { loader.loadLibrary("me.robertlit", "SpigotResourcesAPI", "2.0", "https://repo.pyr.lol/releases"); - loader.loadLibrary(decrypt("com..github..retrooper..packetevents"), "api", "2.1.0", "https://repo.codemc.io/repository/maven-releases/"); - loader.loadLibrary(decrypt("com..github..retrooper..packetevents"), "spigot", "2.1.0", "https://repo.codemc.io/repository/maven-releases/"); + loader.loadLibrary(decrypt("com..github..retrooper..packetevents"), "api", "2.2.0", "https://repo.codemc.io/repository/maven-releases/"); + loader.loadLibrary(decrypt("com..github..retrooper..packetevents"), "spigot", "2.2.0", "https://repo.codemc.io/repository/maven-releases/"); loader.loadLibrary(decrypt("space..arim..dazzleconf"), "dazzleconf-core", "1.2.1"); loader.loadLibrary(decrypt("space..arim..dazzleconf"), "dazzleconf-ext-snakeyaml", "1.2.1"); diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java index 445fc1f..3e421e6 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java @@ -1,6 +1,7 @@ package lol.pyr.znpcsplus.npc; import com.github.retrooper.packetevents.protocol.entity.data.EntityData; +import io.github.retrooper.packetevents.util.SpigotConversionUtil; import lol.pyr.znpcsplus.api.entity.EntityProperty; import lol.pyr.znpcsplus.api.npc.Npc; import lol.pyr.znpcsplus.api.npc.NpcType; @@ -18,6 +19,7 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; import java.util.*; import java.util.stream.Collectors; @@ -148,13 +150,19 @@ public class NpcImpl extends Viewable implements Npc { @Override public void setProperty(EntityProperty key, T value) { - setProperty((EntityPropertyImpl) key, value ); + setProperty((EntityPropertyImpl) key, value); } public void setProperty(EntityPropertyImpl key, T value) { if (key == null) return; if (value == null || value.equals(key.getDefaultValue())) propertyMap.remove(key); - else propertyMap.put(key, value); + if (value instanceof ItemStack) { + ItemStack item = (ItemStack) value; + com.github.retrooper.packetevents.protocol.item.ItemStack packetItem = SpigotConversionUtil.fromBukkitItemStack(item); + propertyMap.put(key, packetItem); + } else { + propertyMap.put(key, value); + } UNSAFE_refreshProperty(key); } diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/tasks/NpcProcessorTask.java b/plugin/src/main/java/lol/pyr/znpcsplus/tasks/NpcProcessorTask.java index f92838d..a077274 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/tasks/NpcProcessorTask.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/tasks/NpcProcessorTask.java @@ -47,6 +47,11 @@ public class NpcProcessorTask extends BukkitRunnable { if (npc.isVisibleTo(player)) npc.hide(player); continue; } + + if (npc.isBlacklisted(player)) { + continue; + } + double distance = player.getLocation().distanceSquared(npc.getBukkitLocation()); // visibility diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java b/plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java index 27e4bad..78978c1 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java @@ -22,6 +22,7 @@ public abstract class Viewable { } private final Set viewers = ConcurrentHashMap.newKeySet(); + private final Set blacklisted = ConcurrentHashMap.newKeySet(); public Viewable() { all.add(new WeakReference<>(this)); @@ -30,6 +31,7 @@ public abstract class Viewable { public void delete() { UNSAFE_hideAll(); viewers.clear(); + blacklisted.clear(); } public void respawn() { @@ -55,8 +57,22 @@ public abstract class Viewable { UNSAFE_hide(player); } + public void blacklist(Player player) { + blacklisted.add(player); + hide(player); + } + + public void unblacklist(Player player) { + blacklisted.remove(player); + } + + public boolean isBlacklisted(Player player) { + return blacklisted.contains(player); + } + public void UNSAFE_removeViewer(Player player) { viewers.remove(player); + blacklisted.remove(player); } protected void UNSAFE_hideAll() {