EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-14 23:50:49 +01:00
Code Issues Projects Releases Wiki Activity

fix bug where armor stand could be renamed to heart symbols

Browse Source
This commit is contained in:
nossr50
2025-10-05 13:30:24 -07:00
parent c79b3fe024
commit 00c0b2e5ec
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@@ -1203,11 +1203,11 @@ public class EntityListener implements Listener {
}
}
private static boolean isMannequinEntity(Entity attacker) {
public static boolean isMannequinEntity(Entity attacker) {
return MANNEQUIN.contains(attacker.getType().toString());
}
private static boolean isArmorStandEntity(Entity attacker) {
public static boolean isArmorStandEntity(Entity attacker) {
return ARMOR_STAND.contains(attacker.getType().toString());
}
}

15
src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java
View File

@@ -1,5 +1,8 @@
package com.gmail.nossr50.util;
import static com.gmail.nossr50.listeners.EntityListener.isArmorStandEntity;
import static com.gmail.nossr50.listeners.EntityListener.isMannequinEntity;
import com.gmail.nossr50.datatypes.MobHealthbarType;
import com.gmail.nossr50.datatypes.meta.OldName;
import com.gmail.nossr50.mcMMO;
@@ -40,8 +43,12 @@ public final class MobHealthbarUtils {
* @param damage damage done by the attack triggering this
*/
public static void handleMobHealthbars(LivingEntity target, double damage, mcMMO plugin) {
if (mcMMO.isHealthBarPluginEnabled() || !mcMMO.p.getGeneralConfig()
.getMobHealthbarEnabled()) {
if (isArmorStandEntity(target) || isMannequinEntity(target)) {
return;
}
if (mcMMO.isHealthBarPluginEnabled()
|| !mcMMO.p.getGeneralConfig().getMobHealthbarEnabled()) {
return;
}
@@ -54,13 +61,13 @@ public final class MobHealthbarUtils {
return;
}
String originalName = target.getName();
final String originalName = target.getName();
String oldName = target.getCustomName();
/*
* Store the name in metadata
*/
if (target.getMetadata(MetadataConstants.METADATA_KEY_OLD_NAME_KEY).size() <= 0) {
if (target.getMetadata(MetadataConstants.METADATA_KEY_OLD_NAME_KEY).isEmpty()) {
target.setMetadata(MetadataConstants.METADATA_KEY_OLD_NAME_KEY,
new OldName(originalName, plugin));
}