Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix canSee(Entity) not existing on old minecraft versions

This commit is contained in:
fullwall 2024-01-13 14:02:12 +08:00
parent 8ca8c14f89
commit cd25930373
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/main/java/net/citizensnpcs/util/NMS.java
View File

@ -518,11 +518,11 @@ public class NMS {
return BRIDGE.getNBT(item); return BRIDGE.getNBT(item);
} }
private static Collection<Player> getNearbyPlayers(Entity from) { private static Collection<Player> getNearbyPlayers(Player from) {
return getNearbyPlayers(from, from.getLocation(), 64); return getNearbyPlayers(from, from.getLocation(), 64);
} }
private static Collection<Player> getNearbyPlayers(Entity from, Location location, double radius) { private static Collection<Player> getNearbyPlayers(Player from, Location location, double radius) {
List<Player> players = Lists.newArrayList(); List<Player> players = Lists.newArrayList();
for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) { for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
if (location.getWorld() != player.getWorld() || from != null && !player.canSee(from) if (location.getWorld() != player.getWorld() || from != null && !player.canSee(from)
@ -760,12 +760,12 @@ public class NMS {
BRIDGE.sendPositionUpdate(from, to, position, bodyYaw, pitch, headYaw); BRIDGE.sendPositionUpdate(from, to, position, bodyYaw, pitch, headYaw);
} }
public static void sendPositionUpdateNearby(Entity from, boolean position) { public static void sendPositionUpdateNearby(Player from, boolean position) {
sendPositionUpdate(from, getNearbyPlayers(from), position, NMS.getYaw(from), from.getLocation().getPitch(), sendPositionUpdate(from, getNearbyPlayers(from), position, NMS.getYaw(from), from.getLocation().getPitch(),
NMS.getHeadYaw(from)); NMS.getHeadYaw(from));
} }
public static void sendPositionUpdateNearby(Entity from, boolean position, Float bodyYaw, Float pitch, public static void sendPositionUpdateNearby(Player from, boolean position, Float bodyYaw, Float pitch,
Float headYaw) { Float headYaw) {
sendPositionUpdate(from, getNearbyPlayers(from), position, bodyYaw, pitch, headYaw); sendPositionUpdate(from, getNearbyPlayers(from), position, bodyYaw, pitch, headYaw);
} }