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

@@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI
{ {
if ((event == null) || event.isEmpty()) 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; return null;
} }

View File

@@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI
} }
default: 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

@@ -784,12 +784,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
if (newClass == null) if (newClass == null)
{ {
LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player);
return false; return false;
} }
else if (newClass == player.getClassId()) else if (newClass == player.getClassId())
{ {
LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!");
return false; return false;
} }
else if (checkIfClassChangeHasOptions(player)) else if (checkIfClassChangeHasOptions(player))

View File

@@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI
} }
default: 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

@@ -125,7 +125,7 @@ public class SkillTransfer extends AbstractNpcAI
if (count < 0) if (count < 0)
{ {
final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName(); 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) if (Config.SKILL_CHECK_REMOVE)
{ {
player.removeSkill(sk); player.removeSkill(sk);

View File

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

View File

@@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler
catch (Exception e) catch (Exception e)
{ {
clanList(player, 1); 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) catch (Exception e)
{ {
clanHome(player); 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) 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")) else if (command.startsWith("bbs_add_fav"))
@@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler
} }
catch (Exception e) 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) 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; return true;

View File

@@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler
} }
catch (Exception e) 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; return count;
} }

View File

@@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler
final String id = command.replace("_bbsloc;", ""); final String id = command.replace("_bbsloc;", "");
if (!Util.isDigit(id)) 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; return false;
} }

View File

@@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
final InstanceTemplate template = manager.getInstanceTemplate(templateId); final InstanceTemplate template = manager.getInstanceTemplate(templateId);
if (template == null) if (template == null)
{ {
LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!");
return; return;
} }

View File

@@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader
} }
else 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; return;
} }
} }

View File

@@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
if (!AdminData.getInstance().hasAccess(command, player.getAccessLevel())) if (!AdminData.getInstance().hasAccess(command, player.getAccessLevel()))
{ {
player.sendMessage("You don't have the access rights to use this command!"); 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; return;
} }

View File

@@ -679,7 +679,7 @@ public class TradeList
{ {
if (_packaged) 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; return 2;
} }

View File

@@ -2723,7 +2723,7 @@ public class Player extends Playable
} }
else else
{ {
LOGGER.warning("Skipping null auto-get skill for player: " + toString()); LOGGER.warning("Skipping null auto-get skill for " + this);
} }
} }
} }
@@ -6272,7 +6272,7 @@ public class Player extends Playable
AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(level); AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(level);
if (accessLevel == null) if (accessLevel == null)
{ {
LOGGER.warning("Can't find access level " + level + " for character " + toString()); LOGGER.warning("Can't find access level " + level + " for " + this);
accessLevel = AdminData.getInstance().getAccessLevel(0); accessLevel = AdminData.getInstance().getAccessLevel(0);
} }
@@ -6306,7 +6306,7 @@ public class Player extends Playable
} }
catch (SQLException e) catch (SQLException e)
{ {
LOGGER.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); LOGGER.log(Level.WARNING, "Failed to update character's accesslevel in db: " + this, e);
} }
} }
@@ -6314,7 +6314,7 @@ public class Player extends Playable
if (accessLevel == null) if (accessLevel == null)
{ {
LOGGER.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); LOGGER.warning("Tryed to set unregistered access level " + level + " for " + this + ". Setting access level without privileges!");
} }
else if (level > 0) else if (level > 0)
{ {
@@ -6643,7 +6643,7 @@ public class Player extends Playable
// a possible restart-while-modifysubclass cheat has been attempted. // a possible restart-while-modifysubclass cheat has been attempted.
// Switching to use base class // Switching to use base class
player.setClassId(player.getBaseClass()); 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 else
{ {
@@ -12876,12 +12876,12 @@ public class Player extends Playable
if (nextLevel == -1) 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 removeSkill(skill, true); // there is no lower skill
} }
else 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 addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one
} }
} }

View File

@@ -99,7 +99,7 @@ public class Teleporter extends Npc
final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName);
if (holder == null) if (holder == null)
{ {
LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!");
return; return;
} }
holder.showTeleportList(player, this); holder.showTeleportList(player, this);
@@ -111,7 +111,7 @@ public class Teleporter extends Npc
final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName);
if (holder == null) if (holder == null)
{ {
LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!");
return; return;
} }
holder.showTeleportList(player, this); holder.showTeleportList(player, this);
@@ -122,7 +122,7 @@ public class Teleporter extends Npc
// Check for required count of params. // Check for required count of params.
if (st.countTokens() != 2) if (st.countTokens() != 2)
{ {
LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); LOGGER.warning(player + " send unhandled teleport command: " + command);
return; return;
} }
@@ -130,7 +130,7 @@ public class Teleporter extends Npc
final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName);
if (holder == null) if (holder == null)
{ {
LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!");
return; return;
} }
holder.doTeleport(player, this, parseNextInt(st, -1)); holder.doTeleport(player, this, parseNextInt(st, -1));

View File

@@ -1586,7 +1586,7 @@ public class Quest extends AbstractScript implements IIdentifiable
final Quest q = QuestManager.getInstance().getQuest(questId); final Quest q = QuestManager.getInstance().getQuest(questId);
if (q == null) 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) if (Config.AUTODELETE_INVALID_QUEST_DATA)
{ {
invalidQuestData.setInt(1, player.getObjectId()); invalidQuestData.setInt(1, player.getObjectId());
@@ -1617,7 +1617,7 @@ public class Quest extends AbstractScript implements IIdentifiable
final QuestState qs = player.getQuestState(questId); final QuestState qs = player.getQuestState(questId);
if (qs == null) 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) if (Config.AUTODELETE_INVALID_QUEST_DATA)
{ {
invalidQuestDataVar.setInt(1, player.getObjectId()); invalidQuestDataVar.setInt(1, player.getObjectId());

View File

@@ -135,7 +135,7 @@ public class TeleportHolder
{ {
if (isNoblesse() && !player.isNoble()) if (isNoblesse() && !player.isNoble())
{ {
LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); LOGGER.warning(player + " requested noblesse teleport without being noble!");
return; return;
} }
@@ -194,14 +194,14 @@ public class TeleportHolder
{ {
if (isNoblesse() && !player.isNoble()) if (isNoblesse() && !player.isNoble())
{ {
LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); LOGGER.warning(player + " requested noblesse teleport without being noble!");
return; return;
} }
final TeleportLocation loc = getLocation(locId); final TeleportLocation loc = getLocation(locId);
if (loc == null) if (loc == null)
{ {
LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!");
return; return;
} }

View File

@@ -120,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
if (skill == null) 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; return;
} }
@@ -137,7 +137,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
{ {
// The previous level skill has not been learned. // The previous level skill has not been learned.
player.sendPacket(SystemMessageId.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; return;
} }
} }
@@ -164,7 +164,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (!canTransform(player)) if (!canTransform(player))
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); 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; return;
} }
@@ -248,7 +248,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (!clan.isLearnableSubPledgeSkill(skill, _subType)) if (!clan.isLearnableSubPledgeSkill(skill, _subType))
{ {
player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_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; return;
} }
@@ -310,7 +310,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (player.isSubClassActive()) if (player.isSubClassActive())
{ {
player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_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; return;
} }
@@ -340,7 +340,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (player.isSubClassActive()) if (player.isSubClassActive())
{ {
player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_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; return;
} }
@@ -403,13 +403,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (player.isSubClassActive()) if (player.isSubClassActive())
{ {
player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_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; return;
} }
if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
return; return;
} }
@@ -425,7 +425,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (count >= 2) if (count >= 2)
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE);
return; return;
} }
@@ -454,14 +454,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (player.isSubClassActive() && !player.isDualClassActive()) if (player.isSubClassActive() && !player.isDualClassActive())
{ {
player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_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; return;
} }
if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
return; return;
} }
@@ -477,7 +477,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (count >= 2) if (count >= 2)
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE);
return; return;
} }
@@ -563,7 +563,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (skillLearn.getGetLevel() > player.getLevel()) if (skillLearn.getGetLevel() > player.getLevel())
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); 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; return false;
} }
@@ -632,7 +632,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
{ {
if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) 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

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

View File

@@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
if (_command.isEmpty()) 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); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }
@@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
} }
catch (Exception e) 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()) if (player.isGM())
{ {
final StringBuilder sb = new StringBuilder(200); final StringBuilder sb = new StringBuilder(200);

View File

@@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
} }
if (msg.getSenderId() != player.getObjectId()) 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; return;
} }
@@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (item.getOwnerId() != player.getObjectId()) 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; return;
} }
if (item.getItemLocation() != ItemLocation.MAIL) 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; return;
} }
if (item.getLocationSlot() != msg.getId()) 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; return;
} }

View File

@@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55))
{ {
PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }

View File

@@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket
} }
if (msg.getReceiverId() != player.getObjectId()) 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; return;
} }

View File

@@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket
} }
if (msg.getSenderId() != player.getObjectId()) 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; return;
} }

View File

@@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
// fast auto-enchant cheat check // fast auto-enchant cheat check
if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000))
{ {
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH);
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return; return;
@@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null)
{ {
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); 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.removeRequest(request.getClass()); player.removeRequest(request.getClass());
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return; return;
@@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null))
{ {
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); 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.removeRequest(request.getClass()); player.removeRequest(request.getClass());
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return; return;
@@ -353,7 +353,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
if (player.getInventory().destroyItem("Enchant", item, player, null) == null) if (player.getInventory().destroyItem("Enchant", item, player, null) == null)
{ {
// unable to destroy item, cheater ? // 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.removeRequest(request.getClass()); player.removeRequest(request.getClass());
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
if (Config.LOG_ITEM_ENCHANTS) if (Config.LOG_ITEM_ENCHANTS)

View File

@@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
default: default:
{ {
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());
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; return;
} }
} }
@@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if (attribute.getType() == opositeElement) if (attribute.getType() == opositeElement)
{ {
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());
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; return;
} }
} }

View File

@@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket
return; return;
} }
PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName());
} }
} }

View File

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

View File

@@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket
{ {
if (_symbolId != 0) 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); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;

View File

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

View File

@@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
// TODO: Test. // TODO: Test.
if (!found) 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); player.sendPacket(ActionFailed.STATIC_PACKET);
} }
} }

View File

@@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket
if (_link.isEmpty()) if (_link.isEmpty())
{ {
PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); PacketLogger.warning(player + " sent empty html link!");
return; return;
} }
if (_link.contains("..")) if (_link.contains(".."))
{ {
PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); PacketLogger.warning(player + " sent invalid html link: link " + _link);
return; return;
} }
final int htmlObjectId = player.validateHtmlAction("link " + _link); final int htmlObjectId = player.validateHtmlAction("link " + _link);
if (htmlObjectId == -1) 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; return;
} }

View File

@@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket
if (player.hasItemRequest()) if (player.hasItemRequest())
{ {
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; return;
} }

View File

@@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
if (msg.getReceiverId() != player.getObjectId()) 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; return;
} }
@@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket
// Calculate needed slots // Calculate needed slots
if (item.getOwnerId() != msg.getSenderId()) 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; return;
} }
if (item.getItemLocation() != ItemLocation.MAIL) 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; return;
} }
if (item.getLocationSlot() != msg.getId()) 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; return;
} }
@@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
if (item.getOwnerId() != msg.getSenderId()) 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; return;
} }

View File

@@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket
if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) 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); Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH);
return; return;
} }

View File

@@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket
if (msg.getReceiverId() != player.getObjectId()) 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; return;
} }

View File

@@ -103,7 +103,7 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket
final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId());
if (!player.getDwarvenRecipeBook().contains(list) && !player.getCommonRecipeBook().contains(list)) 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; return;
} }

View File

@@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket
if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) 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; return;
} }

View File

@@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket
if (msg.getReceiverId() != player.getObjectId()) 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; return;
} }

View File

@@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket
if (msg.getSenderId() != player.getObjectId()) 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; return;
} }

View File

@@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket
if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) 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; return;
} }

View File

@@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
if (player.hasItemRequest()) if (player.hasItemRequest())
{ {
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; return;
} }

View File

@@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) 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; return;
} }

View File

@@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) 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; return;
} }

View File

@@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) 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; return;
} }

View File

@@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed()))
{ {
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); PacketLogger.warning(player + " is trying to learn ability without ability points!");
return; return;
} }
@@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
// Case 1: Learning skill without having X points spent on the specific tree // Case 1: Learning skill without having X points spent on the specific tree
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{ {
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!");
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
{ {
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{ {
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
// Case 3 Learning a skill without having enough points // Case 3 Learning a skill without having enough points
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{ {
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); PacketLogger.warning(player + " is trying to learn ability without ability points!");
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

View File

@@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
{ {
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
player.sendPacket(ExChangeAttributeFail.STATIC); player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return; return;
} }

View File

@@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) if ((_feeDiscountType < 0) || (_feeDiscountType > 2))
{ {
PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + ".");
return; return;
} }
if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null))
{ {
PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory.");
return; return;
} }
else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null))
{ {
PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory.");
return; return;
} }
if ((_durationType < 0) || (_durationType > 5)) if ((_durationType < 0) || (_durationType > 5))
{ {
PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + ".");
return; return;
} }
if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null))
{ {
PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory.");
return; return;
} }
else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null))
{ {
PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory.");
return; return;
} }

View File

@@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket
if (item == null) if (item == null)
{ {
player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT));
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH);
return false; return false;
} }
else if ((count < 1) || (count > 99)) else if ((count < 1) || (count > 99))
{ {
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH);
player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE));
return false; return false;
} }

View File

@@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket
if (item == null) if (item == null)
{ {
player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT));
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH);
return false; return false;
} }
else if ((count < 1) || (count > 99)) else if ((count < 1) || (count > 99))
{ {
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH);
player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE));
return false; return false;
} }

View File

@@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket
packet.writeQ(entry.getValue()); // count packet.writeQ(entry.getValue()); // count
packet.writeH(item.getItem().getType2()); packet.writeH(item.getItem().getType2());
packet.writeH(0); // unknown 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; return true;
} }

View File

@@ -62,7 +62,7 @@ public class Evolve
final Pet currentPet = (Pet) pet; final Pet currentPet = (Pet) pet;
if (currentPet.isAlikeDead()) 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; return false;
} }

View File

@@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI
{ {
if ((event == null) || event.isEmpty()) 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; return null;
} }

View File

@@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI
} }
default: 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

@@ -784,12 +784,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
if (newClass == null) if (newClass == null)
{ {
LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player);
return false; return false;
} }
else if (newClass == player.getClassId()) else if (newClass == player.getClassId())
{ {
LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!");
return false; return false;
} }
else if (checkIfClassChangeHasOptions(player)) else if (checkIfClassChangeHasOptions(player))

View File

@@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI
} }
default: 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

@@ -125,7 +125,7 @@ public class SkillTransfer extends AbstractNpcAI
if (count < 0) if (count < 0)
{ {
final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName(); 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) if (Config.SKILL_CHECK_REMOVE)
{ {
player.removeSkill(sk); player.removeSkill(sk);

View File

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

View File

@@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler
catch (Exception e) catch (Exception e)
{ {
clanList(player, 1); 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) catch (Exception e)
{ {
clanHome(player); 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) 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")) else if (command.startsWith("bbs_add_fav"))
@@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler
} }
catch (Exception e) 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) 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; return true;

View File

@@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler
} }
catch (Exception e) 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; return count;
} }

View File

@@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler
final String id = command.replace("_bbsloc;", ""); final String id = command.replace("_bbsloc;", "");
if (!Util.isDigit(id)) 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; return false;
} }

View File

@@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
final InstanceTemplate template = manager.getInstanceTemplate(templateId); final InstanceTemplate template = manager.getInstanceTemplate(templateId);
if (template == null) if (template == null)
{ {
LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!");
return; return;
} }

View File

@@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader
} }
else 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; return;
} }
} }

View File

@@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
if (!AdminData.getInstance().hasAccess(command, player.getAccessLevel())) if (!AdminData.getInstance().hasAccess(command, player.getAccessLevel()))
{ {
player.sendMessage("You don't have the access rights to use this command!"); 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; return;
} }

View File

@@ -679,7 +679,7 @@ public class TradeList
{ {
if (_packaged) 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; return 2;
} }

View File

@@ -2725,7 +2725,7 @@ public class Player extends Playable
} }
else else
{ {
LOGGER.warning("Skipping null auto-get skill for player: " + toString()); LOGGER.warning("Skipping null auto-get skill for " + this);
} }
} }
} }
@@ -6274,7 +6274,7 @@ public class Player extends Playable
AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(level); AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(level);
if (accessLevel == null) if (accessLevel == null)
{ {
LOGGER.warning("Can't find access level " + level + " for character " + toString()); LOGGER.warning("Can't find access level " + level + " for " + this);
accessLevel = AdminData.getInstance().getAccessLevel(0); accessLevel = AdminData.getInstance().getAccessLevel(0);
} }
@@ -6308,7 +6308,7 @@ public class Player extends Playable
} }
catch (SQLException e) catch (SQLException e)
{ {
LOGGER.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); LOGGER.log(Level.WARNING, "Failed to update character's accesslevel in db: " + this, e);
} }
} }
@@ -6316,7 +6316,7 @@ public class Player extends Playable
if (accessLevel == null) if (accessLevel == null)
{ {
LOGGER.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); LOGGER.warning("Tryed to set unregistered access level " + level + " for " + this + ". Setting access level without privileges!");
} }
else if (level > 0) else if (level > 0)
{ {
@@ -6646,7 +6646,7 @@ public class Player extends Playable
// a possible restart-while-modifysubclass cheat has been attempted. // a possible restart-while-modifysubclass cheat has been attempted.
// Switching to use base class // Switching to use base class
player.setClassId(player.getBaseClass()); 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 else
{ {
@@ -12879,12 +12879,12 @@ public class Player extends Playable
if (nextLevel == -1) 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 removeSkill(skill, true); // there is no lower skill
} }
else 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 addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one
} }
} }

View File

@@ -99,7 +99,7 @@ public class Teleporter extends Npc
final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName);
if (holder == null) if (holder == null)
{ {
LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!");
return; return;
} }
holder.showTeleportList(player, this); holder.showTeleportList(player, this);
@@ -111,7 +111,7 @@ public class Teleporter extends Npc
final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName);
if (holder == null) if (holder == null)
{ {
LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!");
return; return;
} }
holder.showTeleportList(player, this); holder.showTeleportList(player, this);
@@ -122,7 +122,7 @@ public class Teleporter extends Npc
// Check for required count of params. // Check for required count of params.
if (st.countTokens() != 2) if (st.countTokens() != 2)
{ {
LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); LOGGER.warning(player + " send unhandled teleport command: " + command);
return; return;
} }
@@ -130,7 +130,7 @@ public class Teleporter extends Npc
final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName);
if (holder == null) if (holder == null)
{ {
LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!");
return; return;
} }
holder.doTeleport(player, this, parseNextInt(st, -1)); holder.doTeleport(player, this, parseNextInt(st, -1));

View File

@@ -1588,7 +1588,7 @@ public class Quest extends AbstractScript implements IIdentifiable
final Quest q = QuestManager.getInstance().getQuest(questId); final Quest q = QuestManager.getInstance().getQuest(questId);
if (q == null) 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) if (Config.AUTODELETE_INVALID_QUEST_DATA)
{ {
invalidQuestData.setInt(1, player.getObjectId()); invalidQuestData.setInt(1, player.getObjectId());
@@ -1619,7 +1619,7 @@ public class Quest extends AbstractScript implements IIdentifiable
final QuestState qs = player.getQuestState(questId); final QuestState qs = player.getQuestState(questId);
if (qs == null) 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) if (Config.AUTODELETE_INVALID_QUEST_DATA)
{ {
invalidQuestDataVar.setInt(1, player.getObjectId()); invalidQuestDataVar.setInt(1, player.getObjectId());

View File

@@ -135,7 +135,7 @@ public class TeleportHolder
{ {
if (isNoblesse() && (player.getNobleLevel() < 1)) if (isNoblesse() && (player.getNobleLevel() < 1))
{ {
LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); LOGGER.warning(player + " requested noblesse teleport without being noble!");
return; return;
} }
@@ -194,14 +194,14 @@ public class TeleportHolder
{ {
if (isNoblesse() && (player.getNobleLevel() < 1)) if (isNoblesse() && (player.getNobleLevel() < 1))
{ {
LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); LOGGER.warning(player + " requested noblesse teleport without being noble!");
return; return;
} }
final TeleportLocation loc = getLocation(locId); final TeleportLocation loc = getLocation(locId);
if (loc == null) if (loc == null)
{ {
LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!");
return; return;
} }

View File

@@ -120,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
if (skill == null) 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; return;
} }
@@ -137,7 +137,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
{ {
// The previous level skill has not been learned. // The previous level skill has not been learned.
player.sendPacket(SystemMessageId.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; return;
} }
} }
@@ -164,7 +164,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (!canTransform(player)) if (!canTransform(player))
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); 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; return;
} }
@@ -248,7 +248,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (!clan.isLearnableSubPledgeSkill(skill, _subType)) if (!clan.isLearnableSubPledgeSkill(skill, _subType))
{ {
player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_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; return;
} }
@@ -310,7 +310,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (player.isSubClassActive()) if (player.isSubClassActive())
{ {
player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_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; return;
} }
@@ -340,7 +340,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (player.isSubClassActive()) if (player.isSubClassActive())
{ {
player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_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; return;
} }
@@ -403,13 +403,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (player.isSubClassActive()) if (player.isSubClassActive())
{ {
player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_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; return;
} }
if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
return; return;
} }
@@ -425,7 +425,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (count >= 2) if (count >= 2)
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE);
return; return;
} }
@@ -454,14 +454,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (player.isSubClassActive() && !player.isDualClassActive()) if (player.isSubClassActive() && !player.isDualClassActive())
{ {
player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_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; return;
} }
if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE);
return; return;
} }
@@ -477,7 +477,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (count >= 2) if (count >= 2)
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE);
return; return;
} }
@@ -563,7 +563,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (skillLearn.getGetLevel() > player.getLevel()) if (skillLearn.getGetLevel() > player.getLevel())
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); 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; return false;
} }
@@ -632,7 +632,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
{ {
if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) 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

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

View File

@@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
if (_command.isEmpty()) 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); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
return; return;
} }
@@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
} }
catch (Exception e) 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()) if (player.isGM())
{ {
final StringBuilder sb = new StringBuilder(200); final StringBuilder sb = new StringBuilder(200);

View File

@@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
} }
if (msg.getSenderId() != player.getObjectId()) 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; return;
} }
@@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (item.getOwnerId() != player.getObjectId()) 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; return;
} }
if (item.getItemLocation() != ItemLocation.MAIL) 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; return;
} }
if (item.getLocationSlot() != msg.getId()) 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; return;
} }

View File

@@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55))
{ {
PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }

View File

@@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket
} }
if (msg.getReceiverId() != player.getObjectId()) 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; return;
} }

View File

@@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket
} }
if (msg.getSenderId() != player.getObjectId()) 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; return;
} }

View File

@@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
// fast auto-enchant cheat check // fast auto-enchant cheat check
if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000))
{ {
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH);
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return; return;
@@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null)
{ {
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); 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.removeRequest(request.getClass()); player.removeRequest(request.getClass());
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return; return;
@@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null))
{ {
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); 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.removeRequest(request.getClass()); player.removeRequest(request.getClass());
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return; return;
@@ -353,7 +353,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
if (player.getInventory().destroyItem("Enchant", item, player, null) == null) if (player.getInventory().destroyItem("Enchant", item, player, null) == null)
{ {
// unable to destroy item, cheater ? // 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.removeRequest(request.getClass()); player.removeRequest(request.getClass());
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
if (Config.LOG_ITEM_ENCHANTS) if (Config.LOG_ITEM_ENCHANTS)

View File

@@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
default: default:
{ {
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());
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; return;
} }
} }
@@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if (attribute.getType() == opositeElement) if (attribute.getType() == opositeElement)
{ {
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());
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; return;
} }
} }

View File

@@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket
return; return;
} }
PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName());
} }
} }

View File

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

View File

@@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket
{ {
if (_symbolId != 0) 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); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;

View File

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

View File

@@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
// TODO: Test. // TODO: Test.
if (!found) 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); player.sendPacket(ActionFailed.STATIC_PACKET);
} }
} }

View File

@@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket
if (_link.isEmpty()) if (_link.isEmpty())
{ {
PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); PacketLogger.warning(player + " sent empty html link!");
return; return;
} }
if (_link.contains("..")) if (_link.contains(".."))
{ {
PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); PacketLogger.warning(player + " sent invalid html link: link " + _link);
return; return;
} }
final int htmlObjectId = player.validateHtmlAction("link " + _link); final int htmlObjectId = player.validateHtmlAction("link " + _link);
if (htmlObjectId == -1) 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; return;
} }

View File

@@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket
if (player.hasItemRequest()) if (player.hasItemRequest())
{ {
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; return;
} }

View File

@@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
if (msg.getReceiverId() != player.getObjectId()) 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; return;
} }
@@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket
// Calculate needed slots // Calculate needed slots
if (item.getOwnerId() != msg.getSenderId()) 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; return;
} }
if (item.getItemLocation() != ItemLocation.MAIL) 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; return;
} }
if (item.getLocationSlot() != msg.getId()) 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; return;
} }
@@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
if (item.getOwnerId() != msg.getSenderId()) 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; return;
} }

View File

@@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket
if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) 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); Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH);
return; return;
} }

View File

@@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket
if (msg.getReceiverId() != player.getObjectId()) 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; return;
} }

View File

@@ -103,7 +103,7 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket
final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId());
if (!player.getDwarvenRecipeBook().contains(list) && !player.getCommonRecipeBook().contains(list)) 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; return;
} }

View File

@@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket
if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) 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; return;
} }

View File

@@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket
if (msg.getReceiverId() != player.getObjectId()) 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; return;
} }

View File

@@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket
if (msg.getSenderId() != player.getObjectId()) 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; return;
} }

View File

@@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket
if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) 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; return;
} }

View File

@@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
if (player.hasItemRequest()) if (player.hasItemRequest())
{ {
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; return;
} }

View File

@@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) 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; return;
} }

View File

@@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) 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; return;
} }

View File

@@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) 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; return;
} }

View File

@@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed()))
{ {
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); PacketLogger.warning(player + " is trying to learn ability without ability points!");
return; return;
} }
@@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
// Case 1: Learning skill without having X points spent on the specific tree // Case 1: Learning skill without having X points spent on the specific tree
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{ {
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!");
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
{ {
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{ {
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
// Case 3 Learning a skill without having enough points // Case 3 Learning a skill without having enough points
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{ {
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); PacketLogger.warning(player + " is trying to learn ability without ability points!");
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

Some files were not shown because too many files have changed in this diff Show More