Fixed "Show On Look" feature error and added relational placeholders
This commit is contained in:
parent
21ff4d5666
commit
6d4fad9668
Binary file not shown.
Binary file not shown.
|
@ -1,6 +1,6 @@
|
||||||
name: ActionHealth
|
name: ActionHealth
|
||||||
main: com.zeshanaslam.actionhealth.Main
|
main: com.zeshanaslam.actionhealth.Main
|
||||||
version: 3.2.3
|
version: 3.2.4
|
||||||
softdepend: [PlaceholderAPI, MVdWPlaceholderAPI]
|
softdepend: [PlaceholderAPI, MVdWPlaceholderAPI]
|
||||||
commands:
|
commands:
|
||||||
Actionhealth:
|
Actionhealth:
|
||||||
|
|
|
@ -109,6 +109,7 @@ public class HealthUtil {
|
||||||
|
|
||||||
if (plugin.settingsManager.hasPlaceholderAPI) {
|
if (plugin.settingsManager.hasPlaceholderAPI) {
|
||||||
output = me.clip.placeholderapi.PlaceholderAPI.setPlaceholders(player, output);
|
output = me.clip.placeholderapi.PlaceholderAPI.setPlaceholders(player, output);
|
||||||
|
output = me.clip.placeholderapi.PlaceholderAPI.setRelationalPlaceholders(receiver, player, output);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (!plugin.settingsManager.healthMessageOther.isEmpty()) {
|
if (!plugin.settingsManager.healthMessageOther.isEmpty()) {
|
||||||
|
|
|
@ -38,13 +38,12 @@ public class LookThread extends BukkitRunnable {
|
||||||
}
|
}
|
||||||
|
|
||||||
List<LivingEntity> entities = TargetHelper.getLivingTargets(player, plugin.settingsManager.lookDistance);
|
List<LivingEntity> entities = TargetHelper.getLivingTargets(player, plugin.settingsManager.lookDistance);
|
||||||
|
|
||||||
if (!entities.isEmpty()) {
|
if (!entities.isEmpty()) {
|
||||||
for (LivingEntity livingEntity : entities) {
|
for (LivingEntity livingEntity : entities) {
|
||||||
if (livingEntity.getType().name().equals("ARMOR_STAND")) continue;
|
if (livingEntity.getType().name().equals("ARMOR_STAND")) continue;
|
||||||
|
if (player.getWorld() != livingEntity.getWorld()) continue;
|
||||||
|
|
||||||
String name;
|
String name;
|
||||||
|
|
||||||
if (livingEntity.getCustomName() == null) {
|
if (livingEntity.getCustomName() == null) {
|
||||||
name = livingEntity.getName();
|
name = livingEntity.getName();
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue