Better WorldObject toString method usage.

This commit is contained in:
MobiusDevelopment
2022-01-20 07:01:48 +00:00
parent 5fd42cce29
commit f99a7c8667
1254 changed files with 2512 additions and 2512 deletions

View File

@@ -364,7 +364,7 @@ public class TalentShow extends AbstractNpcAI
{
if ((event == null) || event.isEmpty())
{
LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!");
LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!");
return null;
}

View File

@@ -228,7 +228,7 @@ public class AvantGarde extends AbstractNpcAI
}
else
{
LOGGER.warning("Invalid Sub-Class Skill Id: " + skillIdVar + " for player " + player.getName() + "!");
LOGGER.warning("Invalid Sub-Class Skill Id: " + skillIdVar + " for " + player + "!");
}
}
else if (!qvar.isEmpty() && !qvar.equals("0"))
@@ -258,7 +258,7 @@ public class AvantGarde extends AbstractNpcAI
}
else
{
LOGGER.warning("Invalid item object Id: " + qvar + " for player " + player.getName() + "!");
LOGGER.warning("Invalid item object Id: " + qvar + " for " + player + "!");
}
}
}
@@ -275,7 +275,7 @@ public class AvantGarde extends AbstractNpcAI
final Item item = player.getInventory().getItemByItemId(itemId);
if (item != null)
{
LOGGER.warning(getClass().getName() + ": player " + player + " had 'extra' certification skill books while cancelling sub-class certifications!");
LOGGER.warning(getClass().getName() + ": " + player + " had 'extra' certification skill books while cancelling sub-class certifications!");
player.destroyItem("CancelCertificationExtraBooks", item, npc, false);
}
}

View File

@@ -1439,7 +1439,7 @@ public class CastleChamberlain extends AbstractNpcAI
}
default:
{
LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!");
LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!");
}
}
}

View File

@@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI
}
default:
{
LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!");
LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!");
}
}
}

View File

@@ -111,7 +111,7 @@ public class SubClassSkills extends AbstractNpcAI
{
for (Skill s : certSkills)
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has cert skill on subclass :" + s.getName() + "(" + s.getId() + "/" + s.getLevel() + "), class:" + ClassListData.getInstance().getClass(player.getClassId()).getClassName(), IllegalActionPunishmentType.NONE);
Util.handleIllegalPlayerAction(player, player + " has cert skill on subclass :" + s.getName() + "(" + s.getId() + "/" + s.getLevel() + "), class:" + ClassListData.getInstance().getClass(player.getClassId()).getClassName(), IllegalActionPunishmentType.NONE);
if (Config.SKILL_CHECK_REMOVE)
{
player.removeSkill(s);
@@ -268,11 +268,11 @@ public class SubClassSkills extends AbstractNpcAI
{
if (cSkills[i][1] == skill.getLevel())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has invalid cert skill :" + skill.getName() + "(" + skill.getId() + "/" + skill.getLevel() + ")", IllegalActionPunishmentType.NONE);
Util.handleIllegalPlayerAction(player, player + " has invalid cert skill :" + skill.getName() + "(" + skill.getId() + "/" + skill.getLevel() + ")", IllegalActionPunishmentType.NONE);
}
else
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has invalid cert skill :" + skill.getName() + "(" + skill.getId() + "/" + skill.getLevel() + "), level too high", IllegalActionPunishmentType.NONE);
Util.handleIllegalPlayerAction(player, player + " has invalid cert skill :" + skill.getName() + "(" + skill.getId() + "/" + skill.getLevel() + "), level too high", IllegalActionPunishmentType.NONE);
}
if (Config.SKILL_CHECK_REMOVE)

View File

@@ -126,7 +126,7 @@ public class SkillTransfer extends AbstractNpcAI
if (count < 0)
{
final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST);
Util.handleIllegalPlayerAction(player, player + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST);
if (Config.SKILL_CHECK_REMOVE)
{
player.removeSkill(sk);

View File

@@ -82,13 +82,13 @@ public class Link implements IBypassHandler
final String htmlPath = command.substring(4).trim();
if (htmlPath.isEmpty())
{
LOGGER.warning("Player " + player.getName() + " sent empty link html!");
LOGGER.warning(player + " sent empty link html!");
return false;
}
if (htmlPath.contains(".."))
{
LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath);
LOGGER.warning(player + " sent invalid link html: " + htmlPath);
return false;
}

View File

@@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler
catch (Exception e)
{
clanList(player, 1);
LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!");
LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!");
}
}
}
@@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler
catch (Exception e)
{
clanHome(player);
LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!");
LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!");
}
}
}

View File

@@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler
}
catch (Exception e)
{
LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName());
LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player);
}
}
else if (command.startsWith("bbs_add_fav"))
@@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler
}
catch (Exception e)
{
LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName());
LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player);
}
}
}
@@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler
}
catch (Exception e)
{
LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName());
LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player);
}
}
return true;

View File

@@ -326,7 +326,7 @@ public class HomeBoard implements IParseBoardHandler
}
catch (Exception e)
{
LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName());
LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player);
}
return count;
}

View File

@@ -82,7 +82,7 @@ public class RegionBoard implements IWriteBoardHandler
final String id = command.replace("_bbsloc;", "");
if (!Util.isDigit(id))
{
LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!");
LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!");
return false;
}

View File

@@ -244,7 +244,7 @@ public class TerritoryWarSuperClass extends Quest
}
else
{
LOGGER.warning("TerritoryWar: Missing Kill the quest for player " + player.getName() + " whose class id: " + player.getClassId().getId());
LOGGER.warning("TerritoryWar: Missing Kill the quest for " + player + " whose class id: " + player.getClassId().getId());
}
}
}
@@ -372,7 +372,7 @@ public class TerritoryWarSuperClass extends Quest
}
else
{
LOGGER.warning("TerritoryWar: Missing Kill the quest for player " + player.getName() + " whose class id: " + player.getClassId().getId());
LOGGER.warning("TerritoryWar: Missing Kill the quest for " + player + " whose class id: " + player.getClassId().getId());
}
}
}

View File

@@ -239,7 +239,7 @@ public class MultisellData implements IXmlReader
}
else
{
LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!");
LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!");
return;
}
}

View File

@@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
if (!AdminData.getInstance().hasAccess(command, player.getAccessLevel()))
{
player.sendMessage("You don't have the access rights to use this command!");
LOGGER.warning("Player " + player.getName() + " tried to use admin command '" + command + "', without proper access level!");
LOGGER.warning(player + " tried to use admin command '" + command + "', without proper access level!");
return;
}

View File

@@ -440,7 +440,7 @@ public class DimensionalRiftManager
showHtmlFile(player, "data/html/seven_signs/rift/Cheater.htm", npc);
if (!player.isGM())
{
LOGGER.warning("Player " + player.getName() + "(" + player.getObjectId() + ") was cheating in dimension rift area!");
LOGGER.warning(player + " was cheating in dimension rift area!");
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " tried to cheat in dimensional rift.", Config.DEFAULT_PUNISH);
}
}

View File

@@ -833,7 +833,7 @@ public class FourSepulchersManager
{
if (!player.isGM())
{
LOGGER.warning("Player " + player.getName() + "(" + player.getObjectId() + ") tried to cheat in four sepulchers.");
LOGGER.warning(player + " tried to cheat in four sepulchers.");
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " tried to enter four sepulchers with invalid npc id.", Config.DEFAULT_PUNISH);
}
return;

View File

@@ -662,7 +662,7 @@ public class TradeList
{
if (_packaged)
{
Util.handleIllegalPlayerAction(player, "[TradeList.privateStoreBuy()] Player " + player.getName() + " tried to cheat the package sell and buy only a part of the package! Ban this player for bot usage!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, "[TradeList.privateStoreBuy()] " + player + " tried to cheat the package sell and buy only a part of the package! Ban this player for bot usage!", Config.DEFAULT_PUNISH);
return 2;
}

View File

@@ -2676,7 +2676,7 @@ public class Player extends Playable
}
else
{
LOGGER.warning("Skipping null auto-get skill for player: " + toString());
LOGGER.warning("Skipping null auto-get skill for " + this);
}
}
}
@@ -6566,7 +6566,7 @@ public class Player extends Playable
if (!AdminData.getInstance().hasAccessLevel(level))
{
LOGGER.warning("Tried to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!");
LOGGER.warning("Tried to set unregistered access level " + level + " for " + this + ". Setting access level without privileges!");
}
else if (level > 0)
{
@@ -6865,7 +6865,7 @@ public class Player extends Playable
// a possible restart-while-modifysubclass cheat has been attempted.
// Switching to use base class
player.setClassId(player.getBaseClass());
LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing.");
LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing.");
}
else
{
@@ -13582,12 +13582,12 @@ public class Player extends Playable
if (nextLevel == -1)
{
LOGGER.info("Removing skill " + skill + " from player " + toString());
LOGGER.info("Removing skill " + skill + " from " + this);
removeSkill(skill, true); // there is no lower skill
}
else
{
LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString());
LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this);
addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one
}
}

View File

@@ -1468,7 +1468,7 @@ public class Quest extends AbstractScript implements IIdentifiable
final Quest q = QuestManager.getInstance().getQuest(questId);
if (q == null)
{
LOGGER.finer("Unknown quest " + questId + " for player " + player.getName());
LOGGER.finer("Unknown quest " + questId + " for " + player);
if (Config.AUTODELETE_INVALID_QUEST_DATA)
{
invalidQuestData.setInt(1, player.getObjectId());
@@ -1499,7 +1499,7 @@ public class Quest extends AbstractScript implements IIdentifiable
final QuestState qs = player.getQuestState(questId);
if (qs == null)
{
LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName());
LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player);
if (Config.AUTODELETE_INVALID_QUEST_DATA)
{
invalidQuestDataVar.setInt(1, player.getObjectId());

View File

@@ -62,7 +62,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
if (Config.L2WALKER_PROTECTION)
{
final Player player = client.getPlayer();
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is trying to use L2Walker and got kicked.", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " is trying to use L2Walker and got kicked.", Config.DEFAULT_PUNISH);
}
}
return true;

View File

@@ -110,7 +110,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
final Skill skill = SkillData.getInstance().getSkill(_id, _level);
if (skill == null)
{
PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!");
PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!");
return;
}
@@ -126,7 +126,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
{
// The previous level skill has not been learned.
player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE);
Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE);
return;
}
}
@@ -153,7 +153,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (!canTransform(player))
{
player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE);
Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE);
return;
}
@@ -237,7 +237,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (!clan.isLearnableSubPledgeSkill(skill, _subType))
{
player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_ACQUIRED);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE);
Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE);
return;
}
@@ -290,7 +290,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (player.isSubClassActive())
{
player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUB_CLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE);
Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE);
return;
}
@@ -299,7 +299,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
{
// The previous level skill has not been learned.
player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE);
Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE);
return;
}
@@ -313,7 +313,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
}
else
{
PacketLogger.warning("Null SubClassSkills quest, for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + player.getName() + "!");
PacketLogger.warning("Null SubClassSkills quest, for Sub-Class skill Id: " + _id + " level: " + _level + " for " + player + "!");
return;
}
}
@@ -347,12 +347,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
}
else
{
PacketLogger.warning("Inexistent item for object Id " + itemObjId + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + player.getName() + "!");
PacketLogger.warning("Inexistent item for object Id " + itemObjId + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for " + player + "!");
}
}
else
{
PacketLogger.warning("Invalid item object Id " + itemOID + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + player.getName() + "!");
PacketLogger.warning("Invalid item object Id " + itemOID + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for " + player + "!");
}
}
}
@@ -420,7 +420,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (skillLearn.getGetLevel() > player.getLevel())
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE);
Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE);
return false;
}
@@ -479,7 +479,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
{
if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true))
{
Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE);
Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE);
}
}
}

View File

@@ -129,7 +129,7 @@ public class RequestActionUse implements IClientIncomingPacket
if (Arrays.binarySearch(allowedActions, _actionId) < 0)
{
player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().getId());
PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().getId());
return;
}
}

View File

@@ -83,7 +83,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
if (_command.isEmpty())
{
PacketLogger.warning("Player " + player.getName() + " sent empty bypass!");
PacketLogger.warning(player + " sent empty bypass!");
Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
return;
}
@@ -258,7 +258,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
}
catch (Exception e)
{
PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage());
PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage());
if (player.isGM())
{
final StringBuilder sb = new StringBuilder(200);

View File

@@ -71,7 +71,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
}
if (msg.getSenderId() != player.getObjectId())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH);
return;
}
@@ -123,19 +123,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (item.getOwnerId() != player.getObjectId())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH);
return;
}
if (item.getItemLocation() != ItemLocation.MAIL)
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH);
return;
}
if (item.getLocationSlot() != msg.getId())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket
}
if (msg.getReceiverId() != player.getObjectId())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket
}
if (msg.getSenderId() != player.getObjectId())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -120,7 +120,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
// fast auto-enchant cheat check
if ((player.getActiveEnchantTimestamp() == 0) || ((Chronos.currentTimeMillis() - player.getActiveEnchantTimestamp()) < 2000))
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH);
player.setActiveEnchantItemId(Player.ID_NONE);
player.sendPacket(new EnchantResult(2, 0, 0));
return;
@@ -131,7 +131,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
if (scroll == null)
{
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH);
player.setActiveEnchantItemId(Player.ID_NONE);
player.sendPacket(new EnchantResult(2, 0, 0));
return;
@@ -144,7 +144,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
if (support == null)
{
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH);
player.setActiveEnchantItemId(Player.ID_NONE);
player.sendPacket(new EnchantResult(2, 0, 0));
return;
@@ -331,7 +331,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
if (player.getInventory().destroyItem("Enchant", item, player, null) == null)
{
// unable to destroy item, cheater ?
Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH);
player.setActiveEnchantItemId(Player.ID_NONE);
player.sendPacket(new EnchantResult(2, 0, 0));
if (Config.LOG_ITEM_ENCHANTS)

View File

@@ -115,7 +115,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
default:
{
player.setActiveEnchantAttrItemId(Player.ID_NONE);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH);
return;
}
}
@@ -147,7 +147,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if (elm.getElement() == opositeElement)
{
player.setActiveEnchantAttrItemId(Player.ID_NONE);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH);
return;
}
}
@@ -170,7 +170,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if (!player.destroyItem("AttrEnchant", stone, 1, player, true))
{
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to attribute enchant with a stone he doesn't have", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to attribute enchant with a stone he doesn't have", Config.DEFAULT_PUNISH);
player.setActiveEnchantAttrItemId(Player.ID_NONE);
return;
}

View File

@@ -104,7 +104,7 @@ public class RequestExEnchantSkillRouteChange implements IClientIncomingPacket
}
final int beforeEnchantSkillLevel = player.getSkillLevel(_skillId);
// do u have this skill enchanted?
// do you have this skill enchanted?
if (beforeEnchantSkillLevel <= 100)
{
return;

View File

@@ -67,7 +67,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
final Henna henna = HennaData.getInstance().getHenna(_symbolId);
if (henna == null)
{
PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from " + player);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -87,7 +87,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
player.sendPacket(SystemMessageId.THE_SYMBOL_CANNOT_BE_DRAWN);
if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !henna.isAllowedClass(player.getClassId()))
{
Util.handleIllegalPlayerAction(player, "Exploit attempt: Character " + player.getName() + " of account " + player.getAccountName() + " tryed to add a forbidden henna.", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, "Exploit attempt: " + player + " tryed to add a forbidden henna.", Config.DEFAULT_PUNISH);
}
player.sendPacket(ActionFailed.STATIC_PACKET);
}

View File

@@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket
{
if (_symbolId != 0)
{
PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player);
}
player.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket
final Henna henna = HennaData.getInstance().getHenna(_symbolId);
if (henna == null)
{
PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from " + player);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

View File

@@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
// TODO: Test.
if (!found)
{
PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna.");
PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna.");
player.sendPacket(ActionFailed.STATIC_PACKET);
}
}

View File

@@ -51,20 +51,20 @@ public class RequestLinkHtml implements IClientIncomingPacket
if (_link.isEmpty())
{
PacketLogger.warning("Player " + player.getName() + " sent empty html link!");
PacketLogger.warning(player + " sent empty html link!");
return;
}
if (_link.contains(".."))
{
PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link);
PacketLogger.warning(player + " sent invalid html link: link " + _link);
return;
}
final int htmlObjectId = player.validateHtmlAction("link " + _link);
if (htmlObjectId == -1)
{
PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link);
PacketLogger.warning(player + " sent non cached html link: link " + _link);
return;
}

View File

@@ -95,7 +95,7 @@ public class RequestPackageSend implements IClientIncomingPacket
if (player.getActiveEnchantItemId() != Player.ID_NONE)
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -110,7 +110,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
if (msg.getReceiverId() != player.getObjectId())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH);
return;
}
@@ -137,19 +137,19 @@ public class RequestPostAttachment implements IClientIncomingPacket
// Calculate needed slots
if (item.getOwnerId() != msg.getSenderId())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH);
return;
}
if (item.getItemLocation() != ItemLocation.MAIL)
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH);
return;
}
if (item.getLocationSlot() != msg.getId())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH);
return;
}
@@ -196,7 +196,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
if (item.getOwnerId() != msg.getSenderId())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -131,7 +131,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket
if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size()))
{
final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!";
final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!";
Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH);
return;
}

View File

@@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket
if (msg.getReceiverId() != player.getObjectId())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -109,13 +109,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket
final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId());
if (!player.getDwarvenRecipeBook().contains(list) && !player.getCommonRecipeBook().contains(list))
{
Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH);
return;
}
if (i.getCost() > MAX_ADENA)
{
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket
if ((_name != null) && (_name.length() > MAX_MSG_LENGTH))
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -76,7 +76,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket
if (msg.getReceiverId() != player.getObjectId())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -71,7 +71,7 @@ public class RequestRestart implements IClientIncomingPacket
if (player.isChangingClass())
{
PacketLogger.warning("Player " + player.getName() + " tried to restart during class change.");
PacketLogger.warning(player + " tried to restart during class change.");
player.sendPacket(RestartResponse.valueOf(false));
player.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket
if (msg.getSenderId() != player.getObjectId())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -135,7 +135,7 @@ public class Say2 implements IClientIncomingPacket
if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text))
{
Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -111,7 +111,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
if (player.getActiveEnchantItemId() != Player.ID_NONE)
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH))
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH))
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH))
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH);
return;
}

View File

@@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket
packet.writeQ(entry.getValue()); // count
packet.writeH(item.getItem().getType2());
packet.writeH(0); // unknown
packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials
packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials
}
return true;
}

View File

@@ -62,7 +62,7 @@ public class Evolve
final Pet currentPet = (Pet) player.getSummon();
if (currentPet.isAlikeDead())
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH);
return false;
}