From d077154831b47b83f9c0f2d9e457ca36a53e1490 Mon Sep 17 00:00:00 2001 From: Obique Date: Thu, 15 Jan 2015 10:31:38 -0600 Subject: [PATCH] Refactor to have new Player function to get character name --- src/services/chat/ChatService.java | 4 ++-- src/services/player/PlayerManager.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java index 3dfd859de..f86d37c85 100644 --- a/src/services/chat/ChatService.java +++ b/src/services/chat/ChatService.java @@ -123,7 +123,7 @@ public class ChatService extends Service { private void handleInstantMessage(PlayerManager playerMgr, Player sender, ChatInstantMessageToCharacter request) { String strReceiver = request.getCharacter().toLowerCase(); - String strSender = sender.getCreatureObject().getName().toLowerCase(); + String strSender = sender.getCharacterName().toLowerCase(); if (strSender.contains(" ")) strSender = strSender.split(" ")[0]; @@ -162,7 +162,7 @@ public class ChatService extends Service { ChatOnSendPersistentMessage response = new ChatOnSendPersistentMessage(errorCode, request.getCounter()); sender.sendPacket(response); - Mail mail = new Mail(sender.getCreatureObject().getName(), request.getSubject(), request.getMessage(), recId); + Mail mail = new Mail(sender.getCharacterName(), request.getSubject(), request.getMessage(), recId); mail.setId(maxMailId); maxMailId++; mail.setTimestamp((int) (new Date().getTime() / 1000)); diff --git a/src/services/player/PlayerManager.java b/src/services/player/PlayerManager.java index a47d49ff0..10550aaf6 100644 --- a/src/services/player/PlayerManager.java +++ b/src/services/player/PlayerManager.java @@ -87,7 +87,7 @@ public class PlayerManager extends Manager { public Player getPlayerByCreatureName(String name) { synchronized (players) { for (Player p : players.values()) { - if (p.getCreatureObject() != null && p.getCreatureObject().getName().equalsIgnoreCase(name)) + if (p.getCreatureObject() != null && p.getCharacterName().equalsIgnoreCase(name)) return p; } } @@ -98,7 +98,7 @@ public class PlayerManager extends Manager { synchronized (players) { for (Player p : players.values()) { if (p.getCreatureObject() != null) { - String cName = p.getCreatureObject().getName().toLowerCase(); + String cName = p.getCharacterName().toLowerCase(); if (cName.startsWith(name) && (cName.length() == name.length() || cName.charAt(name.length()) == ' ')) { return p; }