lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of PacketLogger class.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-12-08 02:37:47 +00:00
parent c166771753
commit e438ab1776
1929 changed files with 6341 additions and 4020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/PacketLogger.java Normal file
View File

@ -0,0 +1,42 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.network;
import java.util.logging.Logger;
/**
* @author Mobius
*/
public class PacketLogger
{
private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName());
public static synchronized void warning(String message)
{
LOGGER.warning(message);
}
public static synchronized void info(String message)
{
LOGGER.info(message);
}
public static synchronized void finer(String message)
{
LOGGER.finer(message);
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
View File

@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skill.AbnormalType;
import org.l2jmobius.gameserver.model.skill.BuffInfo;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket
default:
{
// Invalid action detected (probably client cheating), log this
LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId);
PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId);
client.sendPacket(ActionFailed.STATIC_PACKET);
break;
}

5
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
View File

@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd;
import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd;
@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket
final TradeList trade = player.getActiveTradeList();
if (trade == null)
{
LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId);
PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId);
return;
}
@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket
// Trade partner not found, cancel trade
if (partner != null)
{
LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId);
PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId);
}
player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE);
player.cancelActiveTrade();

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
View File

@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// player.stopMove();
//
// if (Config.DEBUG)
// LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
// client.getPlayer().sendPacket(smwl);

11
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
View File

@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail;
import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk;
import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
@ -127,21 +128,21 @@ public class CharacterCreate implements IClientIncomingPacket
if ((_face > 2) || (_face < 0))
{
LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client);
PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client);
client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED));
return;
}
if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6)))
{
LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client);
PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client);
client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED));
return;
}
if ((_hairColor > 3) || (_hairColor < 0))
{
LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client);
PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client);
client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED));
return;
}
@ -345,7 +346,7 @@ public class CharacterCreate implements IClientIncomingPacket
final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null);
if (item == null)
{
LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + ".");
PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + ".");
continue;
}
@ -362,7 +363,7 @@ public class CharacterCreate implements IClientIncomingPacket
final Item item = newChar.getInventory().addItem("Balthus Rewards", reward.getId(), reward.getCount(), newChar, null);
if (item == null)
{
LOGGER.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + ".");
PacketLogger.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + ".");
continue;
}

5
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Level;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
import org.l2jmobius.gameserver.model.CharSelectInfoPackage;
@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers;
import org.l2jmobius.gameserver.model.events.EventDispatcher;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail;
import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess;
import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket
}
catch (Exception e)
{
LOGGER.log(Level.SEVERE, "Error:", e);
PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage());
}
final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0);

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java
View File

@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket
final MovieHolder holder = player.getMovieHolder();
if ((holder == null) || (holder.getMovie().getClientId() != _movieId))
{
// LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId);
// PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId);
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -71,6 +71,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
import org.l2jmobius.gameserver.network.serverpackets.Die;
@ -161,7 +162,7 @@ public class EnterWorld implements IClientIncomingPacket
final Player player = client.getPlayer();
if (player == null)
{
LOGGER.warning("EnterWorld failed! player returned 'null'.");
PacketLogger.warning("EnterWorld failed! player returned 'null'.");
Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET);
return;
}

12
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java
View File

@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient;
*/
public class ExGetOnAirShip implements IClientIncomingPacket
{
@SuppressWarnings("unused")
private int _x;
@SuppressWarnings("unused")
private int _y;
@SuppressWarnings("unused")
private int _z;
@SuppressWarnings("unused")
private int _shipId;
@Override
@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
LOGGER.info("[T1:ExGetOnAirShip] x: " + _x);
LOGGER.info("[T1:ExGetOnAirShip] y: " + _y);
LOGGER.info("[T1:ExGetOnAirShip] z: " + _z);
LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId);
// PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x);
// PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y);
// PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z);
// PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId);
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java
View File

@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ExPremiumManagerShowHtml;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@ -77,7 +78,7 @@ public class ExOpenHtml implements IClientIncomingPacket
}
default:
{
LOGGER.warning("Unknown ExOpenHtml type (" + _type + ")");
PacketLogger.warning("Unknown ExOpenHtml type (" + _type + ")");
break;
}
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java
View File

@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.logging.Level;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* Format: c dddd
@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket
}
catch (NoSuchAlgorithmException e)
{
LOGGER.log(Level.WARNING, "", e);
PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage());
}
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.commons.network.IIncomingPacket;
import org.l2jmobius.gameserver.network.GameClient;
@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient;
*/
public interface IClientIncomingPacket extends IIncomingPacket<GameClient>
{
Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName());
}

15
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket
if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null)))
{
LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId);
PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId);
player.setMultiSell(null);
return;
}
@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket
final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer.
if (entry == null)
{
LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId);
PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId);
player.setMultiSell(null);
return;
}
if (!entry.isStackable() && (_amount > 1))
{
LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId);
PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId);
player.setMultiSell(null);
return;
}
@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket
))
//@formatter:on
{
LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId);
PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId);
player.setMultiSell(null);
return;
}
@ -372,7 +373,7 @@ public class MultiSellChoose implements IClientIncomingPacket
}
default:
{
LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + ".");
PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + ".");
return;
}
}
@ -487,7 +488,7 @@ public class MultiSellChoose implements IClientIncomingPacket
}
default:
{
LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + ".");
PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + ".");
return;
}
}
@ -691,7 +692,7 @@ public class MultiSellChoose implements IClientIncomingPacket
}
default:
{
LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + ".");
PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + ".");
return false;
}
}

7
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone;
import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass;
@ -104,7 +105,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000))
{
Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH);
LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player);
PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player);
return;
}
@ -118,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
if (skill == null)
{
LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!");
PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!");
return;
}
@ -450,7 +451,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
}
default:
{
LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType);
PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType);
break;
}
}

5
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo;
@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
if ((_id <= 0) || (_level <= 0))
{
LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!");
PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!");
return;
}
@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
final Skill skill = SkillData.getInstance().getSkill(_id, _level);
if (skill == null)
{
LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed.");
PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed.");
return;
}

10
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
View File

@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.Arrays;
import java.util.logging.Logger;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.ActionData;
@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skill.AbnormalType;
import org.l2jmobius.gameserver.model.skill.BuffInfo;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
*/
public class RequestActionUse implements IClientIncomingPacket
{
private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName());
private int _actionId;
private boolean _ctrlPressed;
private boolean _shiftPressed;
@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket
if (Arrays.binarySearch(allowedActions, _actionId) < 0)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
return;
}
}
@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket
actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed);
return;
}
LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler());
PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler());
return;
}
@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
default:
{
LOGGER.warning(player.getName() + ": unhandled action type " + _actionId);
PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId);
break;
}
}

48
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java
View File

@ -27,30 +27,30 @@ public class RequestAutoUse implements IClientIncomingPacket
@Override
public boolean read(GameClient client, PacketReader packet)
{
final int unk1 = packet.readC(); // C - true. This is summary amount of next data received.
LOGGER.info("received packet RequestAutoUse with unk1:" + unk1);
final int unk2 = packet.readC();
LOGGER.info("and unk2: " + unk2);
final int unk3 = packet.readC(); // Can target mobs, that attacked by other players?
LOGGER.info("and unk3: " + unk3);
final int unk4 = packet.readC(); // Auto pickup?
LOGGER.info("and unk4: " + unk4);
final int unk5 = packet.readC();
LOGGER.info("and unk5: " + unk5);
final int unk6 = packet.readC();
LOGGER.info("and unk6: " + unk6);
final int unk7 = packet.readC(); // short range :1; long: 0
LOGGER.info("and unk7: " + unk7);
final int unk8 = packet.readC(); // received 51 when logged in game...
LOGGER.info("and unk8: " + unk8);
final int unk9 = packet.readC();
LOGGER.info("and unk9: " + unk9);
final int unk10 = packet.readC();
LOGGER.info("and unk10: " + unk10);
final int unk11 = packet.readC();
LOGGER.info("and unk11: " + unk11);
final int unk12 = packet.readC(); // enable/ disable?
LOGGER.info("and unk12: " + unk12);
// final int unk1 = packet.readC(); // C - true. This is summary amount of next data received.
// PacketLogger.info("received packet RequestAutoUse with unk1:" + unk1);
// final int unk2 = packet.readC();
// PacketLogger.info("and unk2: " + unk2);
// final int unk3 = packet.readC(); // Can target mobs, that attacked by other players?
// PacketLogger.info("and unk3: " + unk3);
// final int unk4 = packet.readC(); // Auto pickup?
// PacketLogger.info("and unk4: " + unk4);
// final int unk5 = packet.readC();
// PacketLogger.info("and unk5: " + unk5);
// final int unk6 = packet.readC();
// PacketLogger.info("and unk6: " + unk6);
// final int unk7 = packet.readC(); // short range :1; long: 0
// PacketLogger.info("and unk7: " + unk7);
// final int unk8 = packet.readC(); // received 51 when logged in game...
// PacketLogger.info("and unk8: " + unk8);
// final int unk9 = packet.readC();
// PacketLogger.info("and unk9: " + unk9);
// final int unk10 = packet.readC();
// PacketLogger.info("and unk10: " + unk10);
// final int unk11 = packet.readC();
// PacketLogger.info("and unk11: " + unk11);
// final int unk12 = packet.readC(); // enable/ disable?
// PacketLogger.info("and unk12: " + unk12);
return true;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java
View File

@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData;
import org.l2jmobius.gameserver.model.BlockList;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket
}
default:
{
LOGGER.info("Unknown 0xA9 block type: " + _type);
PacketLogger.info("Unknown 0xA9 block type: " + _type);
}
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product;
import org.l2jmobius.gameserver.model.buylist.ProductList;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList;
@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket
long price = product.getPrice();
if (price < 0)
{
LOGGER.warning("ERROR, no price found .. wrong buylist ??");
PacketLogger.warning("ERROR, no price found .. wrong buylist ??");
client.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

10
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
View File

@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.StringTokenizer;
import java.util.logging.Level;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader;
@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
if (_command.isEmpty())
{
LOGGER.warning("Player " + player.getName() + " sent empty bypass!");
PacketLogger.warning("Player " + player.getName() + " sent empty bypass!");
Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET);
return;
}
@ -194,7 +194,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
}
catch (NumberFormatException nfe)
{
LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe);
PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage());
}
}
else if (_command.startsWith("_match"))
@ -295,13 +295,13 @@ public class RequestBypassToServer implements IClientIncomingPacket
}
else
{
LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]");
PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]");
}
}
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e);
PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage());
if (player.isGM())
{
final StringBuilder sb = new StringBuilder(200);

5
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
View File

@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.model.skill.CommonSkill;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
final Player player = client.getPlayer();
if (player == null)
{
LOGGER.finer("RequestCrystalizeItem: activeChar was null");
// PacketLogger.finer("RequestCrystalizeItem: activeChar was null.");
return;
}
@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
client.sendPacket(ActionFailed.STATIC_PACKET);
if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55))
{
LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
}
return;
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
View File

@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.util.logging.Level;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e);
PacketLogger.warning("Could not delete pet objectid: " + e.getMessage());
}
}
if (itemToRemove.isTimeLimitedItem())

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.util.GMAudit;
import org.l2jmobius.gameserver.util.Util;
@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket
if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000))
{
final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")";
LOGGER.warning(msg);
PacketLogger.warning(msg);
AdminData.getInstance().broadcastMessageToGMs(msg);
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java
View File

@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName;
/**
@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot);
PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot);
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java
View File

@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* Format: chdd d: Arena d: Team
@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket
}
default:
{
LOGGER.warning("Wrong Cube Game Team ID: " + _team);
PacketLogger.warning("Wrong Cube Game Team ID: " + _team);
break;
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
View File

@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* Format: chddd d: Arena d: Answer
@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket
}
default:
{
LOGGER.warning("Unknown Cube Game Answer ID: " + _answer);
PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer);
break;
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java
View File

@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* Format: (ch) just a trigger
@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
LOGGER.info("C5: RequestExFishRanking");
PacketLogger.info("C5: RequestExFishRanking");
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
View File

@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
import org.l2jmobius.gameserver.util.Broadcast;
@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket
else
{
client.sendPacket(ActionFailed.STATIC_PACKET);
LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!");
PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!");
}
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
View File

@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
client.sendPacket(new ExPutEnchantTargetItemResult(0));
if (scrollTemplate == null)
{
LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId());
PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId());
}
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
View File

@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo;
@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket
final Fort fort = FortManager.getInstance().getFortById(_fortressId);
if (fort == null)
{
LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")");
PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")");
if (client.getPlayer() == null)
{
return;

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java
View File

@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* Format: (ch) d
@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket
return;
}
LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName());
PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName());
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java
View File

@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Pet;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
import org.l2jmobius.gameserver.util.Util;
@ -84,7 +85,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket
}
else
{
LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName());
PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName());
}
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java
View File

@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Pet;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
import org.l2jmobius.gameserver.util.Util;
@ -124,7 +125,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket
}
else
{
LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName());
PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName());
}
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
View File

@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList;
@ -60,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
final Henna henna = HennaData.getInstance().getHenna(_symbolId);
if (henna == null)
{
LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player);
PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player);
client.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
View File

@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo;
@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket
{
if (_symbolId != 0)
{
LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
}
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
View File

@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo;
@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket
final Henna henna = HennaData.getInstance().getHenna(_symbolId);
if (henna == null)
{
LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player);
PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player);
client.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
player.sendPacket(new HennaItemRemoveInfo(henna, player));
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
View File

@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@ -76,7 +77,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
// TODO: Test.
if (!found)
{
LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna.");
PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna.");
client.sendPacket(ActionFailed.STATIC_PACKET);
}
}

7
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
View File

@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.Util;
@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket
if (_link.isEmpty())
{
LOGGER.warning("Player " + actor.getName() + " sent empty html link!");
PacketLogger.warning("Player " + actor.getName() + " sent empty html link!");
return;
}
if (_link.contains(".."))
{
LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link);
PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link);
return;
}
final int htmlObjectId = actor.validateHtmlAction("link " + _link);
if (htmlObjectId == -1)
{
LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link);
PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link);
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java
View File

@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* @author UnAfraid
@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket
if (player.getObjectId() != _objectId)
{
LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId);
PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId);
return;
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
View File

@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
player.sendPacket(ActionFailed.STATIC_PACKET);
// if (_magicId > 0)
// {
// LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player);
// PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player);
// }
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
View File

@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanMember;
import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete;
@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
final ClanMember member = clan.getClanMember(_target);
if (member == null)
{
LOGGER.warning("Target (" + _target + ") is not member of the clan");
PacketLogger.warning("Target (" + _target + ") is not member of the clan");
return;
}
if (member.isOnline() && member.getPlayer().isInCombat())

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java
View File

@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* Format: (ch) S
@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str);
PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str);
}
}

7
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
View File

@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.util.Util;
@ -113,7 +114,7 @@ public class RequestPackageSend implements IClientIncomingPacket
final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight");
if (item == null)
{
LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)");
PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)");
warehouse.deleteMe();
return;
}
@ -162,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket
final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
if (oldItem == null)
{
LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
warehouse.deleteMe();
return;
}
@ -170,7 +171,7 @@ public class RequestPackageSend implements IClientIncomingPacket
final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null);
if (newItem == null)
{
LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");
PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");
continue;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java
View File

@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Pet;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@ -137,7 +138,7 @@ public class RequestPetUseItem implements IClientIncomingPacket
else
{
player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM);
LOGGER.warning("No item handler registered for itemId: " + item.getId());
PacketLogger.warning("No item handler registered for itemId: " + item.getId());
}
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java
View File

@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* @author Plim
@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket
}
catch (SQLException e)
{
LOGGER.severe("Error while saving petition feedback");
PacketLogger.warning("Error while saving petition feedback.");
}
}
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
View File

@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
// LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1);
// LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player);
// PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1);
// PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player);
final Player player = client.getPlayer();
if (player == null)
{

6
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
View File

@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader;
@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType;
import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot;
@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket
}
catch (Exception e)
{
LOGGER.log(Level.SEVERE, "", e);
PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage());
}
}
}
@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket
final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null;
if (merchant == null)
{
LOGGER.warning("Null merchant!");
PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!");
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
View File

@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.util.Util;
@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket
client.sendPacket(ActionFailed.STATIC_PACKET);
if (result > 1)
{
LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName());
PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName());
}
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
View File

@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
public class RequestPrivateStoreSell implements IClientIncomingPacket
@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (!storeList.privateStoreSell(player, _items))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName());
PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName());
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList;
import org.l2jmobius.gameserver.model.item.ItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList;
@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket
final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC());
if (item == null)
{
LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)");
PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)");
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket
{
@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket
}
else
{
LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!");
PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!");
}
player.onTransactionRequest(requestor);
}

11
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
View File

@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction;
import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.siege.Fort.FortFunction;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $
@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket
{
if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0))
{
LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!");
PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!");
return;
}
loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL);
@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket
}
else
{
LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!");
PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!");
return;
}
}
@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket
final Clan clan = player.getClan();
if ((clan == null) || (clan.getFortId() == 0))
{
LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!");
PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!");
return;
}
loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS);
@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket
if (((siegeClan == null) || siegeClan.getFlag().isEmpty()))
{
LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!");
PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!");
return;
}
loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG);
@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket
{
if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection())
{
LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!");
PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!");
return;
}
if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false))

5
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java
View File

@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.Mail;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket
final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach");
if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped())
{
LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)");
PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)");
return false;
}
final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]");
if (newItem == null)
{
LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)");
PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)");
continue;
}
newItem.setItemLocation(newItem.getItemLocation(), msg.getId());

11
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java
View File

@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
if ((player == null) || (castle == null))
{
LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId);
PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId);
return;
}
if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId()))
{
LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!");
PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!");
}
else if (!player.isClanLeader())
{
LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!");
PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!");
}
else if (!castle.isTimeRegistrationOver())
{
@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket
}
else
{
LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !");
PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !");
}
}
else
{
LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!");
PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!");
}
}

11
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@ -112,7 +113,7 @@ public class Say2 implements IClientIncomingPacket
ChatType chatType = ChatType.findByClientId(_type);
if (chatType == null)
{
LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text);
PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text);
player.sendPacket(ActionFailed.STATIC_PACKET);
Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return;
@ -120,7 +121,7 @@ public class Say2 implements IClientIncomingPacket
if (_text.isEmpty())
{
LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!");
PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!");
player.sendPacket(ActionFailed.STATIC_PACKET);
Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET);
return;
@ -214,7 +215,7 @@ public class Say2 implements IClientIncomingPacket
}
else
{
LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client);
PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client);
}
}
@ -260,7 +261,7 @@ public class Say2 implements IClientIncomingPacket
final Item item = owner.getInventory().getItemByObjectId(id);
if (item == null)
{
LOGGER.info(client + " trying publish item which doesnt own! ID:" + id);
PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id);
return false;
}
item.publish();
@ -268,7 +269,7 @@ public class Say2 implements IClientIncomingPacket
pos1 = _text.indexOf(8, pos) + 1;
if (pos1 == 0) // missing ending tag
{
LOGGER.info(client + " sent invalid publish item msg! ID:" + id);
PacketLogger.info(client + " sent invalid publish item msg! ID:" + id);
return false;
}
}

7
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
View File

@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.util.Util;
@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
if (item == null)
{
LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)");
PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)");
return;
}
@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
if (oldItem == null)
{
LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
return;
}
@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager);
if (newItem == null)
{
LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");
PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");
continue;
}

5
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
View File

@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse;
import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.util.Util;
@ -156,14 +157,14 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
final Item oldItem = warehouse.getItemByObjectId(i.getId());
if ((oldItem == null) || (oldItem.getCount() < i.getCount()))
{
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)");
PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)");
return;
}
final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, player.getLastFolkNPC());
if (newItem == null)
{
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
return;
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.ActionType;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowVariationMakeWindow;
@ -282,7 +283,7 @@ public class UseItem implements IClientIncomingPacket
{
if ((etcItem != null) && (etcItem.getHandlerName() != null))
{
LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!");
PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!");
}
}
else if (handler.useItem(player, item, _ctrlPressed))

17
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
View File

@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@ -56,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD());
if (holder.getSkillLevel() < 1)
{
LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!");
PacketLogger.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!");
return false;
}
if (_skills.putIfAbsent(holder.getSkillId(), holder) != null)
{
LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!");
PacketLogger.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!");
return false;
}
}
@ -85,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed()))
{
LOGGER.warning("Player " + player + " is trying to learn ability without ability points!");
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
return;
}
@ -114,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
final SkillLearn learn = SkillTreeData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel());
if (learn == null)
{
LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
client.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@ -122,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
final Skill skill = holder.getSkill();
if (skill == null)
{
LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
client.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@ -155,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
// Case 1: Learning skill without having X points spent on the specific tree
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{
LOGGER.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
client.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -165,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
{
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{
LOGGER.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
client.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -174,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
// Case 3 Learning a skill without having enough points
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{
LOGGER.warning("Player " + player + " is trying to learn ability without ability points!");
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
client.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

5
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java
View File

@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@ -98,13 +99,13 @@ public class RequestAlchemyConversion implements IClientIncomingPacket
if (data == null)
{
player.sendPacket(new ExAlchemyConversion(0, 0));
LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel);
PacketLogger.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel);
return;
}
// if (!_ingredients.equals(data.getIngredients()))
// {
// LOGGER.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player);
// PacketLogger.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player);
// return;
// }

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java
View File

@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.skill.CommonSkill;
import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket
else // Player used packet injection tool.
{
final Player player = client.getPlayer();
LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName());
PacketLogger.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName());
Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET);
return false;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
View File

@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
import org.l2jmobius.gameserver.network.serverpackets.classchange.ExClassChangeSetAlarm;
@ -89,7 +90,7 @@ public class ExRequestClassChange implements IClientIncomingPacket
if (!canChange //
&& (_classId != 170) && (player.getClassId().getId() != 133)) // Female Soul Hound fix.
{
LOGGER.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!");
PacketLogger.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!");
return;
}

15
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
View File

@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if ((_feeDiscountType < 0) || (_feeDiscountType > 2))
{
LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + ".");
PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + ".");
return;
}
if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null))
{
LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory.");
PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory.");
return;
}
else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null))
{
LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory.");
PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory.");
return;
}
if ((_durationType < 0) || (_durationType > 5))
{
LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + ".");
PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + ".");
return;
}
if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null))
{
LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory.");
PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory.");
return;
}
else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null))
{
LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory.");
PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory.");
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.CrystalType;
import org.l2jmobius.gameserver.model.skill.CommonSkill;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
LOGGER.warning(player + ": tried to crystallize " + item.getItem());
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}

26
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.ensoul;
import java.util.logging.Logger;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.EnsoulData;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.AbnormalType;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
*/
public class RequestItemEnsoul implements IClientIncomingPacket
{
private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName());
private int _itemObjectId;
private EnsoulItemOption[] _options;
@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket
final Item item = player.getInventory().getItemByObjectId(_itemObjectId);
if (item == null)
{
LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!");
PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!");
return;
}
if (!item.isEquipable())
{
LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!");
PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!");
return;
}
if (!item.isWeapon())
{
LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!");
PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!");
return;
}
if (item.isCommonItem())
{
LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!");
PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!");
return;
}
if (item.isShadowItem())
{
LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!");
PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!");
return;
}
if (item.isHeroItem())
{
LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!");
PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!");
return;
}
if ((_options == null) || (_options.length == 0))
{
LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!");
PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!");
return;
}
@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket
if (!stone.getOptions().contains(itemOption.getSoulCrystalOption()))
{
LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!");
PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!");
continue;
}
final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption());
if (option == null)
{
LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!");
PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!");
continue;
}
@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket
}
else
{
LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!");
PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!");
continue;
}
if (fee == null)
{
LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)");
PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)");
continue;
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java
View File

@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.util.logging.Level;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e);
PacketLogger.warning("Could not add friend objectid: " + e.getMessage());
}
}
else

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java
View File

@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.util.logging.Level;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.network.PacketReader;
@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, "could not del friend objectid: ", e);
PacketLogger.warning("Could not del friend objectid: " + e.getMessage());
}
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java
View File

@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.homunculus.Homunculus;
import org.l2jmobius.gameserver.model.homunculus.HomunculusTemplate;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExHomunculusSummonResult;
import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo;
@ -210,7 +211,7 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket
final HomunculusTemplate template = HomunculusData.getInstance().getTemplate(homunculusId);
if (template == null)
{
LOGGER.warning("Counld not find Homunculus template " + homunculusId + ".");
PacketLogger.warning("Counld not find Homunculus template " + homunculusId + ".");
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExSummonHomunculusCouponResult.java
View File

@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.homunculus.Homunculus;
import org.l2jmobius.gameserver.model.homunculus.HomunculusTemplate;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo;
import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusList;
@ -216,7 +217,7 @@ public class RequestExSummonHomunculusCouponResult implements IClientIncomingPac
final HomunculusTemplate template = HomunculusData.getInstance().getTemplate(homunculusId);
if (template == null)
{
LOGGER.warning("Could not find Homunculus template " + homunculusId + ".");
PacketLogger.warning("Could not find Homunculus template " + homunculusId + ".");
return;
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
View File

@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.util.logging.Level;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.network.PacketReader;
@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.events.EventDispatcher;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, e.getMessage(), e);
PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage());
}
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java
View File

@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.RewardRequest;
import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket
if (player.hasRequest(RewardRequest.class))
{
LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName());
PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName());
Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET);
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java
View File

@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.PrimeShopData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList;
@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket
}
default:
{
LOGGER.warning(player + " send unhandled product list type: " + _type);
PacketLogger.warning(player + " send unhandled product list type: " + _type);
break;
}
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
View File

@ -51,7 +51,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
}
else
{
// LOGGER.warning("Could not find spawn info for boss " + bossId + ".");
// PacketLogger.warning("Could not find spawn info for boss " + bossId + ".");
}
}
else

5
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
View File

@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.model.zone.type.SayuneZone;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket
if (zone.getMapId() == -1)
{
player.sendMessage("That zone is not supported yet!");
LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set");
PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set");
return;
}
@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket
if (map == null)
{
player.sendMessage("This zone is not handled yet!!");
LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName());
PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName());
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java
View File

@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Shuttle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
/**
@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket
player.getInVehiclePosition().setXYZ(_x, _y, _z);
break;
}
LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player));
PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player));
}
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java
View File

@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.TeleportListHolder;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
@ -55,7 +56,7 @@ public class ExRequestTeleport implements IClientIncomingPacket
final TeleportListHolder teleport = TeleportListData.getInstance().getTeleport(_teleportId);
if (teleport == null)
{
LOGGER.warning("No registered teleport location for id: " + _teleportId);
PacketLogger.warning("No registered teleport location for id: " + _teleportId);
return;
}

5
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java
View File

@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.data.xml.TeleportListData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
/**
@ -53,7 +54,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket
if (TeleportListData.getInstance().getTeleport(_teleportId) == null)
{
LOGGER.warning("No registered teleport location for id: " + _teleportId);
PacketLogger.warning("No registered teleport location for id: " + _teleportId);
return;
}
@ -62,7 +63,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket
{
if (TeleportListData.getInstance().getTeleport(_teleportId) == null)
{
LOGGER.warning("No registered teleport location for id: " + _teleportId);
PacketLogger.warning("No registered teleport location for id: " + _teleportId);
}
else
{

7
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
View File

@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.logging.Level;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.enums.HtmlActionScope;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.util.Util;
/**
@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
{
if (html.length() > 17200)
{
LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable());
PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!");
_html = html.substring(0, 17200);
}
@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
if (content == null)
{
setHtml("<html><body>My Text is missing:<br>" + path + "</body></html>");
LOGGER.warning("missing html page " + path);
PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path);
return false;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java
View File

@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
/**
@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket
}
else
{
LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty.");
PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty.");
}
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java
View File

@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* @author Migi, DS
@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket
}
else
{
LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty.");
PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty.");
}
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java
View File

@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* @author KenM
@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket
}
else
{
LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!");
PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!");
packet.writeS("");
}
}

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.logging.Logger;
import org.l2jmobius.commons.network.IOutgoingPacket;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
*/
public interface IClientOutgoingPacket extends IOutgoingPacket
{
Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName());
int[] PAPERDOLL_ORDER = new int[]
{
Inventory.PAPERDOLL_UNDER,

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
View File

@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.Clan.SubPledge;
import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* @author -Wooden-
@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket
}
else if (_clan.getClanMember(LeaderId) == null)
{
LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]");
PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]");
return "";
}
else

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
View File

@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.RecipeHolder;
import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
public class RecipeItemMakeInfo implements IClientOutgoingPacket
{
@ -77,7 +78,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket
packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering.
return true;
}
LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id);
PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id);
return false;
}
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
View File

@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
/**
* Shows the Siege Info<br>
@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket
}
else
{
LOGGER.warning("Null owner for castle: " + _castle.getName());
PacketLogger.warning("Null owner for castle: " + _castle.getName());
}
}
else

5
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation;
@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket
// Mobius: With additional on-screen damage param (popup), length is increased.
if (param.getType() != TYPE_POPUP_ID)
{
LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
}
}
@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket
{
if (param == null)
{
LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
PacketLogger.warning("Found null parameter for SystemMessageId " + _smId);
continue;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
View File

@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
public class WareHouseWithdrawalList extends AbstractItemPacket
{
@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket
_invSize = player.getInventory().getSize();
if (_player.getActiveWarehouse() == null)
{
LOGGER.warning("error while sending withdraw request to: " + _player.getName());
PacketLogger.warning("error while sending withdraw request to: " + _player.getName());
return;
}

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java
View File

@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.instancemanager.RankManager;
import org.l2jmobius.gameserver.model.olympiad.Hero;
import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
/**
@ -134,7 +135,7 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket
}
catch (SQLException e)
{
LOGGER.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage());
PacketLogger.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage());
}
}
return true;

5
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java
View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.olympiad.Hero;
import org.l2jmobius.gameserver.model.olympiad.Olympiad;
import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
/**
@ -96,7 +97,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket
}
catch (SQLException e)
{
LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage());
PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage());
}
int previousPlace = 0;
@ -125,7 +126,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket
}
catch (SQLException e)
{
LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage());
PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage());
}
int heroCount = 0;