diff --git a/Changelog.txt b/Changelog.txt index c9a165be8..7a7d137c8 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,6 @@ Version 2.1.159 Fixed a memory leak involving renamed mobs + Updated Adventure library (used in our chat code) Version 2.1.158 Fixed a bug where Lure level 4 and above would break fishing with the new Master Angler diff --git a/pom.xml b/pom.xml index cb291c50a..7defad4d5 100755 --- a/pom.xml +++ b/pom.xml @@ -202,12 +202,12 @@ net.kyori adventure-text-serializer-gson - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT net.kyori adventure-api - 4.2.0-SNAPSHOT + 4.2.0 net.kyori @@ -232,7 +232,7 @@ org.apache.maven.scm maven-scm-provider-gitexe - 1.8.1 + 1.9.4 org.bstats diff --git a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java b/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java index f306a4854..0ba956dd5 100644 --- a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java +++ b/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java @@ -56,8 +56,8 @@ public final class MobHealthbarUtils { /* * Store the name in metadata */ - if(target.getMetadata("mcMMO_oldName").size() <= 0 && originalName != null) - target.setMetadata("mcMMO_oldName", new OldName(originalName, plugin)); + if(target.getMetadata(TransientMetadataTools.OLD_NAME_METAKEY).size() <= 0 && originalName != null) + target.setMetadata(TransientMetadataTools.OLD_NAME_METAKEY, new OldName(originalName, plugin)); if (oldName == null) { oldName = ""; diff --git a/src/main/java/com/gmail/nossr50/util/TransientMetadataTools.java b/src/main/java/com/gmail/nossr50/util/TransientMetadataTools.java index 72649c548..b84e8c60e 100644 --- a/src/main/java/com/gmail/nossr50/util/TransientMetadataTools.java +++ b/src/main/java/com/gmail/nossr50/util/TransientMetadataTools.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.mcMMO; import org.bukkit.entity.LivingEntity; public class TransientMetadataTools { - public static final String OLD_NAME_METAKEY = "mcMMO_oldName"; + public static final String OLD_NAME_METAKEY = TransientMetadataTools.OLD_NAME_METAKEY; private final mcMMO pluginRef; public TransientMetadataTools(mcMMO pluginRef) { diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index 464fa9e50..2c28b1969 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -448,7 +448,7 @@ public final class CombatUtils { */ public static void fixNames(@NotNull LivingEntity entity) { - List metadataValue = entity.getMetadata("mcMMO_oldName"); + List metadataValue = entity.getMetadata(TransientMetadataTools.OLD_NAME_METAKEY); if(metadataValue.size() <= 0) return;