From be432ed1bda4d3cb6feae1c7b1df894172024cbe Mon Sep 17 00:00:00 2001 From: xGinko Date: Fri, 29 Sep 2023 17:49:11 +0200 Subject: [PATCH] small fix --- .../java/me/xginko/villageroptimizer/WrappedVillager.java | 2 +- .../modules/RenameOptimizedVillagers.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/xginko/villageroptimizer/WrappedVillager.java b/src/main/java/me/xginko/villageroptimizer/WrappedVillager.java index 4debf95..e9623b0 100644 --- a/src/main/java/me/xginko/villageroptimizer/WrappedVillager.java +++ b/src/main/java/me/xginko/villageroptimizer/WrappedVillager.java @@ -180,7 +180,7 @@ public final class WrappedVillager { return dataContainer.has(Keys.LAST_LEVELUP.key(), PersistentDataType.LONG) ? (villager.getWorld().getFullTime() - (dataContainer.get(Keys.LAST_LEVELUP.key(), PersistentDataType.LONG) + cooldown_millis)) : cooldown_millis; } - public void renameForOptimization(final @Nullable Component newName, final boolean replace_existing_name) { + public void rename(final @Nullable Component newName, final boolean replace_existing_name) { if (replace_existing_name) { villager.customName(newName); if (newName == null) dataContainer.remove(Keys.LAST_OPTIMIZE_NAME.key()); diff --git a/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimizedVillagers.java b/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimizedVillagers.java index 3a04e5b..be0e856 100644 --- a/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimizedVillagers.java +++ b/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimizedVillagers.java @@ -3,6 +3,7 @@ package me.xginko.villageroptimizer.modules; import me.xginko.villageroptimizer.VillagerOptimizer; import me.xginko.villageroptimizer.WrappedVillager; import me.xginko.villageroptimizer.config.Config; +import me.xginko.villageroptimizer.enums.OptimizationType; import me.xginko.villageroptimizer.events.VillagerOptimizeEvent; import me.xginko.villageroptimizer.events.VillagerUnoptimizeEvent; import net.kyori.adventure.text.Component; @@ -50,15 +51,17 @@ public class RenameOptimizedVillagers implements VillagerOptimizerModule, Listen private void onOptimize(VillagerOptimizeEvent event) { WrappedVillager wVillager = event.getWrappedVillager(); wVillager.villager().getScheduler().runDelayed(plugin, rename -> { - wVillager.renameForOptimization(optimized_name, overwrite_previous_name); + wVillager.rename(optimized_name, overwrite_previous_name); }, null, 10L); } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) private void onUnOptimize(VillagerUnoptimizeEvent event) { WrappedVillager wVillager = event.getWrappedVillager(); + if (wVillager.getOptimizationType().equals(OptimizationType.NAMETAG)) return; + wVillager.villager().getScheduler().runDelayed(plugin, rename -> { - wVillager.renameForOptimization(null, overwrite_previous_name); + wVillager.rename(null, overwrite_previous_name); }, null, 10L); } }