From 6669421c36ed8404a72972f18c090781da1683c4 Mon Sep 17 00:00:00 2001
From: xGinko <rachel.audrey@mail.de>
Date: Mon, 2 Oct 2023 12:46:12 +0200
Subject: [PATCH] rename before forgetting name

---
 .../me/xginko/villageroptimizer/modules/RenameOptimized.java  | 4 ++--
 .../me/xginko/villageroptimizer/modules/RenameOptimized.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java
index 48d68fd..e390e43 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java
@@ -68,10 +68,10 @@ public class RenameOptimized implements VillagerOptimizerModule, Listener {
         plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> {
             final Component currentName = villager.customName();
             final Component memorizedName = wVillager.getMemorizedName();
-            if (memorizedName != null)
-                wVillager.forgetName();
             if (currentName != null && currentName.equals(memorizedName))
                 villager.customName(null);
+            if (memorizedName != null)
+                wVillager.forgetName();
         }, 10L);
     }
 }
\ No newline at end of file
diff --git a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java
index 07f837c..51035b4 100644
--- a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java
+++ b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java
@@ -68,10 +68,10 @@ public class RenameOptimized implements VillagerOptimizerModule, Listener {
         villager.getScheduler().runDelayed(plugin, unNameOptimized -> {
             final Component currentName = villager.customName();
             final Component memorizedName = wVillager.getMemorizedName();
-            if (memorizedName != null)
-                wVillager.forgetName();
             if (currentName != null && currentName.equals(memorizedName))
                 villager.customName(null);
+            if (memorizedName != null)
+                wVillager.forgetName();
         }, null, 10L);
     }
 }
\ No newline at end of file