From 7b505bb8e93412eeae8649d03deba8e39e118b9b Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sat, 21 Mar 2020 19:19:57 +0100 Subject: [PATCH] Fix resident rename Even more than last time --- .../core/component/towny/TownyComponent.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Chroma-Core/src/main/java/buttondevteam/core/component/towny/TownyComponent.java b/Chroma-Core/src/main/java/buttondevteam/core/component/towny/TownyComponent.java index 0acf1ef..7455887 100644 --- a/Chroma-Core/src/main/java/buttondevteam/core/component/towny/TownyComponent.java +++ b/Chroma-Core/src/main/java/buttondevteam/core/component/towny/TownyComponent.java @@ -4,7 +4,6 @@ import buttondevteam.core.ComponentManager; import buttondevteam.core.MainPlugin; import buttondevteam.lib.TBMCCoreAPI; import buttondevteam.lib.architecture.Component; -import com.palmergames.bukkit.towny.Towny; import com.palmergames.bukkit.towny.TownyUniverse; import com.palmergames.bukkit.towny.exceptions.AlreadyRegisteredException; import com.palmergames.bukkit.towny.exceptions.NotRegisteredException; @@ -34,22 +33,23 @@ public class TownyComponent extends Component { if (!ComponentManager.isEnabled(TownyComponent.class)) return; Bukkit.getLogger().info("Renaming" + oldName + " in Towny to " + newName); - TownyUniverse tu = Towny.getPlugin(Towny.class).getTownyUniverse(); - Resident resident = tu.getResidentMap().get(oldName.toLowerCase()); //The map keys are lowercase - if (resident == null) { - Bukkit.getLogger().warning("Resident not found - couldn't rename in Towny."); - TBMCCoreAPI.sendDebugMessage("Resident not found - couldn't rename in Towny."); - } else if (tu.getDataSource().hasResident(newName)) { - Bukkit.getLogger().warning("Target resident name is already in use."); - TBMCCoreAPI.sendDebugMessage("Target resident name is already in use. (" + oldName + " -> " + newName + ")"); - } else - try { + TownyUniverse tu = TownyUniverse.getInstance(); + try { + Resident resident = tu.getDataSource().getResident(oldName); + if (resident == null) { + Bukkit.getLogger().warning("Resident not found - couldn't rename in Towny."); + TBMCCoreAPI.sendDebugMessage("Resident not found - couldn't rename in Towny."); + } else if (tu.getDataSource().hasResident(newName)) { + Bukkit.getLogger().warning("Target resident name is already in use."); + TBMCCoreAPI.sendDebugMessage("Target resident name is already in use. (" + oldName + " -> " + newName + ")"); + } else { tu.getDataSource().renamePlayer(resident, newName); //Fixed in Towny 0.91.1.2 Bukkit.getLogger().info("Renaming done."); - } catch (AlreadyRegisteredException e) { - TBMCCoreAPI.SendException("Failed to rename resident, there's already one with this name.", e); - } catch (NotRegisteredException e) { - TBMCCoreAPI.SendException("Failed to rename resident, the resident isn't registered.", e); } + } catch (AlreadyRegisteredException e) { + TBMCCoreAPI.SendException("Failed to rename resident, there's already one with this name.", e); + } catch (NotRegisteredException e) { + TBMCCoreAPI.SendException("Failed to rename resident, the resident isn't registered.", e); + } } }