Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-22 10:36:10 +01:00
Code Issues Projects Releases Wiki Activity

Update to setting type

Browse Source
This commit is contained in:
fullwall 2024-08-16 10:25:35 +08:00
parent c66ff1eeee
commit b00e99fedb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/net/citizensnpcs/Settings.java
View File

@ -240,7 +240,7 @@ public class Settings {
NPC_SKIN_ROTATION_UPDATE_DEGREES("npc.skins.rotation-update-degrees", 90f), NPC_SKIN_ROTATION_UPDATE_DEGREES("npc.skins.rotation-update-degrees", 90f),
NPC_SKIN_USE_LATEST("Whether to fetch new skins from Minecraft every so often", NPC_SKIN_USE_LATEST("Whether to fetch new skins from Minecraft every so often",
"npc.skins.use-latest-by-default", false), "npc.skins.use-latest-by-default", false),
NPC_SKIN_VIEW_DISTANCE("View distance in blocks", "npc.skins.view-distance", 100D), NPC_SKIN_VIEW_DISTANCE("View distance in blocks", "npc.skins.view-distance", 100),
NPC_WATER_SPEED_MODIFIER("Movement speed percentage increase while in water", NPC_WATER_SPEED_MODIFIER("Movement speed percentage increase while in water",
"npc.movement.water-speed-modifier", 1.15F), "npc.movement.water-speed-modifier", 1.15F),
PACKET_HOLOGRAMS("Use packet NPCs for name holograms (experimental)", "npc.use-packet-holograms", false), PACKET_HOLOGRAMS("Use packet NPCs for name holograms (experimental)", "npc.use-packet-holograms", false),

2
main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java
View File

@ -129,7 +129,7 @@ public class SkinPacketTracker {
return; return;
updateNearbyViewers(entity.getNPC().data().get(NPC.Metadata.TRACKING_RANGE, updateNearbyViewers(entity.getNPC().data().get(NPC.Metadata.TRACKING_RANGE,
Setting.NPC_SKIN_VIEW_DISTANCE.asDouble())); Setting.NPC_SKIN_VIEW_DISTANCE.asInt()));
} }
}.runTaskLater(CitizensAPI.getPlugin(), 15); }.runTaskLater(CitizensAPI.getPlugin(), 15);
} }

12
main/src/main/java/net/citizensnpcs/npc/skin/SkinUpdateTracker.java
View File

@ -64,7 +64,7 @@ public class SkinUpdateTracker {
Location skinLoc = entity.getLocation(); Location skinLoc = entity.getLocation();
if (playerLoc.distance(skinLoc) > skinnable.getNPC().data().get(NPC.Metadata.TRACKING_RANGE, if (playerLoc.distance(skinLoc) > skinnable.getNPC().data().get(NPC.Metadata.TRACKING_RANGE,
Setting.NPC_SKIN_VIEW_DISTANCE.asDouble())) Setting.NPC_SKIN_VIEW_DISTANCE.asInt()))
return false; return false;
// see if the NPC is within the players field of view // see if the NPC is within the players field of view
@ -262,17 +262,17 @@ public class SkinUpdateTracker {
return; return;
double viewDistance = skinnable.getNPC().data().get(NPC.Metadata.TRACKING_RANGE, double viewDistance = skinnable.getNPC().data().get(NPC.Metadata.TRACKING_RANGE,
Setting.NPC_SKIN_VIEW_DISTANCE.asDouble()); Setting.NPC_SKIN_VIEW_DISTANCE.asInt());
Location location = entity.getLocation(); Location location = entity.getLocation();
List<Player> players = entity.getWorld().getPlayers(); List<Player> players = entity.getWorld().getPlayers();
for (Player player : players) { for (Player player : players) {
if (player.hasMetadata("NPC")) { if (player.hasMetadata("NPC"))
continue; continue;
}
Location ploc = player.getLocation(); Location ploc = player.getLocation();
if (ploc.getWorld() != location.getWorld() || ploc.distance(location) > viewDistance) { if (ploc.getWorld() != location.getWorld() || ploc.distance(location) > viewDistance)
continue; continue;
}
PlayerTracker tracker = playerTrackers.get(player.getUniqueId()); PlayerTracker tracker = playerTrackers.get(player.getUniqueId());
if (tracker != null) { if (tracker != null) {
tracker.hardReset(player); tracker.hardReset(player);