|
|
|
@ -275,7 +275,7 @@ public enum ChatManager {
@@ -275,7 +275,7 @@ public enum ChatManager {
|
|
|
|
|
PlayerCharacter pcSender = null; |
|
|
|
|
|
|
|
|
|
if (sender.getObjectType().equals(GameObjectType.PlayerCharacter)) |
|
|
|
|
pcSender = (PlayerCharacter) sender; |
|
|
|
|
pcSender = sender; |
|
|
|
|
|
|
|
|
|
if (isFlood) { |
|
|
|
|
ChatManager.chatSayError(pcSender, FLOOD_USER_ERROR); |
|
|
|
@ -597,7 +597,6 @@ public enum ChatManager {
@@ -597,7 +597,6 @@ public enum ChatManager {
|
|
|
|
|
distroList.remove(awo); |
|
|
|
|
else if (awo.getObjectUUID() == tar.getObjectUUID()) |
|
|
|
|
distroList.remove(awo); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
String textToThief = ""; |
|
|
|
@ -607,19 +606,18 @@ public enum ChatManager {
@@ -607,19 +606,18 @@ public enum ChatManager {
|
|
|
|
|
if (item != null) //Steal
|
|
|
|
|
if (success) { |
|
|
|
|
String name = ""; |
|
|
|
|
if (item.getItemBase() != null) |
|
|
|
|
if (item.getItemBase().getUUID() == 7) |
|
|
|
|
name = amount + " gold "; |
|
|
|
|
else { |
|
|
|
|
String vowels = "aeiou"; |
|
|
|
|
ItemTemplate template = ItemTemplate.templates.get(item.getTemplateID()); |
|
|
|
|
String iName = template.item_base_name; |
|
|
|
|
if (iName.length() > 0) |
|
|
|
|
if (vowels.indexOf(iName.substring(0, 1).toLowerCase()) >= 0) |
|
|
|
|
name = "an " + iName + ' '; |
|
|
|
|
else |
|
|
|
|
name = "a " + iName + ' '; |
|
|
|
|
} |
|
|
|
|
if (item.getItemBase().getUUID() == 7) |
|
|
|
|
name = amount + " gold "; |
|
|
|
|
else { |
|
|
|
|
String vowels = "aeiou"; |
|
|
|
|
ItemTemplate template = ItemTemplate.templates.get(item.getTemplateID()); |
|
|
|
|
String iName = template.item_base_name; |
|
|
|
|
if (iName.length() > 0) |
|
|
|
|
if (vowels.indexOf(iName.substring(0, 1).toLowerCase()) >= 0) |
|
|
|
|
name = "an " + iName + ' '; |
|
|
|
|
else |
|
|
|
|
name = "a " + iName + ' '; |
|
|
|
|
} |
|
|
|
|
textToThief = "You have stolen " + name + "from " + tar.getFirstName() + '!'; |
|
|
|
|
textToVictim = sender.getFirstName() + "is caught with thier hands in your pocket!"; |
|
|
|
|
//textToOthers = sender.getFirstName() + " steals " + name + "from " + target.getFirstName() + ".";
|
|
|
|
@ -641,6 +639,7 @@ public enum ChatManager {
@@ -641,6 +639,7 @@ public enum ChatManager {
|
|
|
|
|
//Send msg to thief
|
|
|
|
|
HashSet<AbstractWorldObject> senderList = new HashSet<>(); |
|
|
|
|
senderList.add(sender); |
|
|
|
|
|
|
|
|
|
if (!textToThief.isEmpty()) |
|
|
|
|
ChatManager.chatSystemSend(senderList, textToThief, 1, 2); |
|
|
|
|
|
|
|
|
|