Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Pyrbu:2.X' into 2.X

Browse Source
This commit is contained in:
D3v1s0m 2023-07-18 16:39:29 +05:30 committed by GitHub
commit da7e4cdb78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/main/java/lol/pyr/znpcsplus/api/npc/Npc.java
View File

@ -5,6 +5,7 @@ import lol.pyr.znpcsplus.api.hologram.Hologram;
import lol.pyr.znpcsplus.api.interaction.InteractionAction; import lol.pyr.znpcsplus.api.interaction.InteractionAction;
import lol.pyr.znpcsplus.util.NpcLocation; import lol.pyr.znpcsplus.util.NpcLocation;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@ -20,4 +21,8 @@ public interface Npc extends PropertyHolder {
UUID getUuid(); UUID getUuid();
World getWorld(); World getWorld();
List<? extends InteractionAction> getActions(); List<? extends InteractionAction> getActions();
boolean isVisibleTo(Player player);
void hide(Player player);
void show(Player player);
void respawn(Player player);
} }

4
plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java
View File

@ -3,11 +3,11 @@ package lol.pyr.znpcsplus.util;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
public abstract class Viewable { public abstract class Viewable {
private final Set<Player> viewers = new HashSet<>(); private final Set<Player> viewers = ConcurrentHashMap.newKeySet();
public void delete() { public void delete() {
UNSAFE_hideAll(); UNSAFE_hideAll();