From 1bbf2933793ac384c66a2d55e42f87e7de9a3bd1 Mon Sep 17 00:00:00 2001
From: Andrzej Pomirski <andrzej.pomirski@gmail.com>
Date: Sun, 29 Jun 2014 22:22:28 +0200
Subject: [PATCH] Fix nicknames

---
 .../Listeners/Economy/ServerAccountCorrector.java     | 11 +++++------
 .../Listeners/PostTransaction/TransactionLogger.java  |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/Economy/ServerAccountCorrector.java b/src/main/java/com/Acrobot/ChestShop/Listeners/Economy/ServerAccountCorrector.java
index 666376f0..ad580b8f 100644
--- a/src/main/java/com/Acrobot/ChestShop/Listeners/Economy/ServerAccountCorrector.java
+++ b/src/main/java/com/Acrobot/ChestShop/Listeners/Economy/ServerAccountCorrector.java
@@ -3,7 +3,6 @@ package com.Acrobot.ChestShop.Listeners.Economy;
 import com.Acrobot.ChestShop.ChestShop;
 import com.Acrobot.ChestShop.Events.Economy.*;
 import com.Acrobot.ChestShop.UUIDs.NameManager;
-import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -22,7 +21,7 @@ public class ServerAccountCorrector implements Listener {
     public static void onCurrencyAdd(CurrencyAddEvent event) {
         UUID target = event.getTarget();
 
-        if (!NameManager.isAdminShop(target) || Bukkit.getOfflinePlayer(target).getName().equals(SERVER_ECONOMY_ACCOUNT)) {
+        if (!NameManager.isAdminShop(target) || NameManager.getUsername(target).equals(SERVER_ECONOMY_ACCOUNT)) {
             return;
         }
 
@@ -43,7 +42,7 @@ public class ServerAccountCorrector implements Listener {
     public static void onCurrencySubtract(CurrencySubtractEvent event) {
         UUID target = event.getTarget();
 
-        if (!NameManager.isAdminShop(target) || Bukkit.getOfflinePlayer(target).getName().equals(SERVER_ECONOMY_ACCOUNT)) {
+        if (!NameManager.isAdminShop(target) || NameManager.getUsername(target).equals(SERVER_ECONOMY_ACCOUNT)) {
             return;
         }
 
@@ -64,7 +63,7 @@ public class ServerAccountCorrector implements Listener {
     public static void onCurrencyCheck(CurrencyCheckEvent event) {
         UUID target = event.getAccount();
 
-        if (!NameManager.isAdminShop(target) || Bukkit.getOfflinePlayer(target).getName().equals(SERVER_ECONOMY_ACCOUNT)) {
+        if (!NameManager.isAdminShop(target) || NameManager.getUsername(target).equals(SERVER_ECONOMY_ACCOUNT)) {
             return;
         }
 
@@ -85,7 +84,7 @@ public class ServerAccountCorrector implements Listener {
     public static void onCurrencyHoldCheck(CurrencyHoldEvent event) {
         UUID target = event.getAccount();
 
-        if (!NameManager.isAdminShop(target) || Bukkit.getOfflinePlayer(target).getName().equals(SERVER_ECONOMY_ACCOUNT)) {
+        if (!NameManager.isAdminShop(target) || NameManager.getUsername(target).equals(SERVER_ECONOMY_ACCOUNT)) {
             return;
         }
 
@@ -97,7 +96,7 @@ public class ServerAccountCorrector implements Listener {
     public static void onBalanceCheck(CurrencyAmountEvent event) {
         UUID target = event.getAccount();
 
-        if (!NameManager.isAdminShop(target) || Bukkit.getOfflinePlayer(target).getName().equals(SERVER_ECONOMY_ACCOUNT)) {
+        if (!NameManager.isAdminShop(target) || NameManager.getUsername(target).equals(SERVER_ECONOMY_ACCOUNT)) {
             return;
         }
 
diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/TransactionLogger.java b/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/TransactionLogger.java
index 1af6d413..5dfd0de6 100644
--- a/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/TransactionLogger.java
+++ b/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/TransactionLogger.java
@@ -38,7 +38,7 @@ public class TransactionLogger implements Listener {
                         event.getClient().getName(),
                         items.toString(),
                         event.getPrice(),
-                        event.getOwner().getName(),
+                        NameManager.getUsername(event.getOwner().getUniqueId()),
                         LocationUtil.locationToString(event.getSign().getLocation()));
 
                 ChestShop.getBukkitLogger().info(message);