Fork/mmocore
1
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

fixed an issue with citizens NPC targeting

Browse Source
This commit is contained in:
Indyuce 2021-10-29 00:03:30 +02:00
parent 1ce89703a7
commit f4551be1db
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
View File

@ -882,6 +882,17 @@ public class PlayerData extends OfflinePlayerData {
return MMOCore.plugin.dataProvider.getDataManager().get(uuid);
}
/**
* This is being used to easily check if an online player corresponds to
* a real player or a Citizens NPC. Citizens NPCs do not have any player
* data associated to them
*
* @return Checks if plater data is loaded for a specific player UID
*/
public static boolean has(UUID uuid) {
return MMOCore.plugin.dataProvider.getDataManager().isLoaded(uuid);
}
public static Collection<PlayerData> getAll() {
return MMOCore.plugin.dataProvider.getDataManager().getLoaded();
}

2
src/main/java/net/Indyuce/mmocore/comp/MMOCoreTargetRestriction.java
View File

@ -11,7 +11,7 @@ public class MMOCoreTargetRestriction implements TargetRestriction {
@Override
public boolean canTarget(Player player, LivingEntity target, InteractionType interaction) {
if (interaction.isOffense() && target instanceof Player) {
if (interaction.isOffense() && target instanceof Player && PlayerData.has(target.getUniqueId())) {
PlayerData targetData = PlayerData.get(target.getUniqueId());
// Check for the same party