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

Removed main server debug config.

Browse Source
This commit is contained in:
MobiusDev
2017-12-09 21:24:30 +00:00
parent 5b8e5b462d
commit e7ab6986cf
393 changed files with 77 additions and 3640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java
View File

@@ -456,8 +456,6 @@ public final class Config
public static boolean SKILL_CHECK_ENABLE;
public static boolean SKILL_CHECK_REMOVE;
public static boolean SKILL_CHECK_GM;
public static boolean DEBUG;
public static boolean DEBUG_INSTANCES;
public static boolean HTML_ACTION_CACHE_DEBUG;
public static boolean PACKET_HANDLER_DEBUG;
public static boolean DEVELOPER;
@@ -1832,8 +1830,6 @@ public final class Config
SKILL_CHECK_ENABLE = General.getBoolean("SkillCheckEnable", false);
SKILL_CHECK_REMOVE = General.getBoolean("SkillCheckRemove", false);
SKILL_CHECK_GM = General.getBoolean("SkillCheckGM", true);
DEBUG = General.getBoolean("Debug", false);
DEBUG_INSTANCES = General.getBoolean("InstanceDebug", false);
HTML_ACTION_CACHE_DEBUG = General.getBoolean("HtmlActionCacheDebug", false);
PACKET_HANDLER_DEBUG = General.getBoolean("PacketHandlerDebug", false);
DEVELOPER = General.getBoolean("Developer", false);
@@ -2923,8 +2919,6 @@ public final class Config
DATAPACK_ROOT = new File(".");
}
DEBUG = ServerSettings.getBoolean("Debug", false);
ACCEPT_NEW_GAMESERVER = ServerSettings.getBoolean("AcceptNewGameServer", true);
LOGIN_TRY_BEFORE_BAN = ServerSettings.getInt("LoginTryBeforeBan", 5);

11
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java
View File

@@ -23,7 +23,6 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
import java.util.Collection;
import java.util.concurrent.Future;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -167,11 +166,6 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
@Override
synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
{
if (Config.DEBUG)
{
_log.warning(getClass().getSimpleName() + ": changeIntention(" + intention + ", " + arg0 + ", " + arg1 + ")");
}
if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present
{
// Check if actor is not dead
@@ -310,11 +304,6 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
*/
private void thinkAttack()
{
if (Config.DEBUG)
{
_log.warning(getClass().getSimpleName() + ": thinkAttack(); timeout=" + (_attackTimeout - GameTimeController.getInstance().getGameTicks()));
}
if ((_attackTimeout < GameTimeController.getInstance().getGameTicks()) && _actor.isRunning())
{
_actor.setWalking();

11
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java
View File

@@ -23,7 +23,6 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
import java.util.Collection;
import java.util.concurrent.Future;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -165,11 +164,6 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
@Override
synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
{
if (Config.DEBUG)
{
_log.info(getClass().getSimpleName() + ": changeIntention(" + intention + ", " + arg0 + ", " + arg1 + ")");
}
if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present
{
// Check if actor is not dead
@@ -305,11 +299,6 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
*/
private void thinkAttack()
{
if (Config.DEBUG)
{
_log.info(getClass().getSimpleName() + ": thinkAttack(); timeout=" + (_attackTimeout - GameTimeController.getInstance().getGameTicks()));
}
if ((_attackTimeout < GameTimeController.getInstance().getGameTicks()) && _actor.isRunning())
{
// Set the actor movement type to walk and send Server->Client packet ChangeMoveType to all others L2PcInstance

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@@ -151,11 +151,6 @@ public class ClanTable
return null;
}
if (Config.DEBUG)
{
_log.info(getClass().getSimpleName() + ": " + player.getObjectId() + "(" + player.getName() + ") requested a clan creation.");
}
if (10 > player.getLevel())
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN);

12
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
View File

@@ -20,7 +20,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.util.data.xml.IXmlReader;
@@ -37,6 +36,7 @@ public final class HitConditionBonusData implements IXmlReader
private int highBonus = 0;
private int lowBonus = 0;
private int darkBonus = 0;
@SuppressWarnings("unused")
private int rainBonus = 0;
/**
@@ -52,16 +52,6 @@ public final class HitConditionBonusData implements IXmlReader
{
parseDatapackFile("data/stats/hitConditionBonus.xml");
LOGGER.info(getClass().getSimpleName() + ": Loaded Hit Condition bonuses.");
if (Config.DEBUG)
{
LOGGER.info(getClass().getSimpleName() + ": Front bonus: " + frontBonus);
LOGGER.info(getClass().getSimpleName() + ": Side bonus: " + sideBonus);
LOGGER.info(getClass().getSimpleName() + ": Back bonus: " + backBonus);
LOGGER.info(getClass().getSimpleName() + ": High bonus: " + highBonus);
LOGGER.info(getClass().getSimpleName() + ": Low bonus: " + lowBonus);
LOGGER.info(getClass().getSimpleName() + ": Dark bonus: " + darkBonus);
LOGGER.info(getClass().getSimpleName() + ": Rain bonus: " + rainBonus);
}
}
@Override

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java
View File

@@ -907,10 +907,6 @@ public class AugmentationData
}
stat12 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1);
if (Config.DEBUG)
{
LOGGER.info(getClass().getSimpleName() + ": Augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; resultColor=" + resultColor + "; level=" + lifeStoneLevel + "; grade=" + lifeStoneGrade);
}
return new L2Augmentation(((stat34 << 16) + stat12));
}
@@ -1039,10 +1035,6 @@ public class AugmentationData
// stat12 has stats only
stat12 = base + skillsLength + (ACC_STAT_SUBBLOCKSIZE * resultColor) + stat12;
if (Config.DEBUG)
{
LOGGER.info(getClass().getSimpleName() + ": Accessory augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; level=" + lifeStoneLevel);
}
return new L2Augmentation(((stat34 << 16) + stat12));
}

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/ItemTable.java
View File

@@ -232,11 +232,6 @@ public class ItemTable
}
}
if (Config.DEBUG)
{
LOGGER.fine(getClass().getSimpleName() + ": Item created oid:" + item.getObjectId() + " itemid:" + itemId);
}
// Add the L2ItemInstance object to _allObjects of L2world
L2World.getInstance().storeObject(item);

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SkillData.java
View File

@@ -20,10 +20,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import com.l2jmobius.gameserver.engines.DocumentEngine;
import com.l2jmobius.gameserver.model.skills.Skill;
@@ -117,10 +115,6 @@ public final class SkillData
// requested level too high
if ((maxLvl > 0) && (level > maxLvl))
{
if (Config.DEBUG)
{
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": call to unexisting skill level id: " + skillId + " requested level: " + level + " max level: " + maxLvl, new Throwable());
}
return _skills.get(getSkillHashCode(skillId, maxLvl));
}

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
View File

@@ -103,12 +103,6 @@ public final class CastleManorManager implements IXmlReader, IStorable
{
ThreadPoolManager.scheduleAtFixedRate(this::storeMe, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000);
}
// Send debug message
if (Config.DEBUG)
{
LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode);
}
}
else
{
@@ -430,10 +424,6 @@ public final class CastleManorManager implements IXmlReader, IStorable
}
}
scheduleModeChange();
if (Config.DEBUG)
{
LOGGER.info(getClass().getName() + ": Manor mode changed to " + _mode + "!");
}
}
public final void setNextSeedProduction(List<SeedProduction> list, int castleId)

41
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java
View File

@@ -169,10 +169,6 @@ public class Lottery
_log.log(Level.WARNING, "Lottery: Could not restore lottery data: " + e.getMessage(), e);
}
if (Config.DEBUG)
{
_log.info("Lottery: Starting ticket sell for lottery #" + getId() + ".");
}
_isSellingTickets = true;
_isStarted = true;
@@ -225,10 +221,6 @@ public class Lottery
@Override
public void run()
{
if (Config.DEBUG)
{
_log.info("Lottery: Stopping ticket sell for lottery #" + getId() + ".");
}
_isSellingTickets = false;
Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.LOTTERY_TICKET_SALES_HAVE_BEEN_TEMPORARILY_SUSPENDED));
@@ -245,11 +237,6 @@ public class Lottery
@Override
public void run()
{
if (Config.DEBUG)
{
_log.info("Lottery: Ending lottery #" + getId() + ".");
}
final int[] luckynums = new int[5];
int luckynum = 0;
@@ -274,11 +261,6 @@ public class Lottery
luckynums[i] = luckynum;
}
if (Config.DEBUG)
{
_log.info("Lottery: The lucky numbers are " + luckynums[0] + ", " + luckynums[1] + ", " + luckynums[2] + ", " + luckynums[3] + ", " + luckynums[4] + ".");
}
int enchant = 0;
int type2 = 0;
@@ -294,11 +276,6 @@ public class Lottery
}
}
if (Config.DEBUG)
{
_log.info("Lottery: Encoded lucky numbers are " + enchant + ", " + type2);
}
int count1 = 0;
int count2 = 0;
int count3 = 0;
@@ -386,20 +363,7 @@ public class Lottery
prize3 = (long) (((getPrize() - prize4) * Config.ALT_LOTTERY_3_NUMBER_RATE) / count3);
}
if (Config.DEBUG)
{
_log.info("Lottery: " + count1 + " players with all FIVE numbers each win " + prize1 + ".");
_log.info("Lottery: " + count2 + " players with FOUR numbers each win " + prize2 + ".");
_log.info("Lottery: " + count3 + " players with THREE numbers each win " + prize3 + ".");
_log.info("Lottery: " + count4 + " players with ONE or TWO numbers each win " + prize4 + ".");
}
final long newprize = getPrize() - (prize1 + prize2 + prize3 + prize4);
if (Config.DEBUG)
{
_log.info("Lottery: Jackpot for next lottery is " + newprize + ".");
}
SystemMessage sm;
if (count1 > 0)
{
@@ -552,11 +516,6 @@ public class Lottery
res[1] = 200;
}
}
if (Config.DEBUG)
{
_log.warning("count: " + count + ", id: " + id + ", enchant: " + enchant + ", type2: " + type2);
}
}
}
}

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java
View File

@@ -475,11 +475,6 @@ public class CursedWeapon implements INamable
public void saveData()
{
if (Config.DEBUG)
{
_log.info("CursedWeapon: Saving data to disk.");
}
try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement del = con.prepareStatement("DELETE FROM cursed_weapons WHERE itemId = ?");
PreparedStatement ps = con.prepareStatement("INSERT INTO cursed_weapons (itemId, charId, playerKarma, playerPkKills, nbKills, endTime) VALUES (?, ?, ?, ?, ?, ?)"))

27
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java
View File

@@ -975,10 +975,6 @@ public class L2Clan implements IIdentifiable, INamable
ps.setInt(9, getNewLeaderId());
ps.setInt(10, getId());
ps.execute();
if (Config.DEBUG)
{
_log.fine("New clan leader saved in db: " + getId());
}
}
catch (Exception e)
{
@@ -1020,10 +1016,6 @@ public class L2Clan implements IIdentifiable, INamable
ps.setInt(12, getAllyCrestId());
ps.setInt(13, getNewLeaderId());
ps.execute();
if (Config.DEBUG)
{
_log.fine("New clan saved in db: " + getId());
}
}
catch (Exception e)
{
@@ -1127,11 +1119,6 @@ public class L2Clan implements IIdentifiable, INamable
}
}
if (Config.DEBUG && (getName() != null))
{
_log.info("Restored clan data for \"" + getName() + "\" from database.");
}
restoreSubPledges();
restoreRankPrivs();
restoreSkills();
@@ -1897,11 +1884,6 @@ public class L2Clan implements IIdentifiable, INamable
// TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST
}
}
if (Config.DEBUG)
{
_log.fine("New sub_clan saved in db: " + getId() + "; " + pledgeType);
}
}
catch (Exception e)
{
@@ -1967,10 +1949,6 @@ public class L2Clan implements IIdentifiable, INamable
ps.setInt(3, getId());
ps.setInt(4, pledgeType);
ps.execute();
if (Config.DEBUG)
{
_log.fine("Subpledge updated in db: " + getId());
}
}
catch (Exception e)
{
@@ -2405,11 +2383,6 @@ public class L2Clan implements IIdentifiable, INamable
return;
}
if (Config.DEBUG)
{
_log.fine(player.getObjectId() + "(" + player.getName() + ") requested ally creation from ");
}
if (!player.isClanLeader())
{
player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES);

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2GroupSpawn.java
View File

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model;
import java.util.logging.Level;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.sql.impl.TerritoryTable;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2ControllableMobInstance;
@@ -84,10 +83,6 @@ public class L2GroupSpawn extends L2Spawn
mob.spawnMe(newlocx, newlocy, newlocz);
mob.onSpawn();
if (Config.DEBUG)
{
_log.finest("Spawned Mob Id: " + _template.getId() + " ,at: X: " + mob.getX() + " Y: " + mob.getY() + " Z: " + mob.getZ());
}
return mob;
}
catch (Exception e)

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java
View File

@@ -687,10 +687,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
_lastSpawnPoints.put(mob.getObjectId(), new Location(newlocx, newlocy, newlocz));
}
if (Config.DEBUG)
{
_log.finest("Spawned Mob Id: " + _template.getId() + " , at: X: " + mob.getX() + " Y: " + mob.getY() + " Z: " + mob.getZ());
}
// Increase the current number of L2NpcInstance managed by this L2Spawn
_currentCount++;
return mob;

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2World.java
View File

@@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
import com.l2jmobius.gameserver.data.xml.impl.AdminData;
import com.l2jmobius.gameserver.model.actor.L2Playable;
@@ -259,10 +258,6 @@ public final class L2World
// Get all visible objects contained in the _visibleObjects of L2WorldRegions
// in a circular area of 2000 units
final List<L2Object> visibles = getVisibleObjects(object, 2000);
if (Config.DEBUG)
{
_log.finest("objects in range:" + visibles.size());
}
// tell the player about the surroundings
// Go through the visible objects contained in the circular area

27
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java
View File

@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentHashMap;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager;
import com.l2jmobius.gameserver.instancemanager.ClanHallManager;
@@ -153,21 +152,11 @@ public final class L2AuctioneerInstance extends L2Npc
return;
}
if (Config.DEBUG)
{
_log.warning("bidding show successful");
}
try
{
final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
final int auctionId = Integer.parseInt(val);
if (Config.DEBUG)
{
_log.warning("auction test started");
}
final String filename = "data/html/auction/AgitAuctionInfo.htm";
final Auction a = ClanHallAuctionManager.getInstance().getAuction(auctionId);
@@ -182,7 +171,7 @@ public final class L2AuctioneerInstance extends L2Npc
html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
html.replace("%AGIT_AUCTION_COUNT%", String.valueOf(a.getBidders().size()));
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
@@ -298,11 +287,6 @@ public final class L2AuctioneerInstance extends L2Npc
limit *= Integer.parseInt(val);
}
if (Config.DEBUG)
{
_log.warning("cmd list: auction test started");
}
final StringBuilder items = new StringBuilder();
items.append("<table width=280 border=0><tr>");
for (int j = 1; j <= npage; j++)
@@ -385,11 +369,6 @@ public final class L2AuctioneerInstance extends L2Npc
auctionId = Integer.parseInt(val);
}
if (Config.DEBUG)
{
_log.warning("cmd bidlist: auction test started");
}
String biders = "";
final Map<Integer, Bidder> bidders = ClanHallAuctionManager.getInstance().getAuction(auctionId).getBidders();
for (Bidder b : bidders.values())
@@ -425,7 +404,7 @@ public final class L2AuctioneerInstance extends L2Npc
html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
html.replace("%AGIT_AUCTION_MYBID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid()));
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
@@ -456,7 +435,7 @@ public final class L2AuctioneerInstance extends L2Npc
html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
html.replace("%AGIT_AUCTION_BIDCOUNT%", String.valueOf(a.getBidders().size()));
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());

72
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java
View File

@@ -360,7 +360,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Provides additional HP recovery for clan members in the clan hall.<font color=\"00FFFF\">" + percent + "%</font>");
html.replace("%apply%", "recovery hp " + percent);
sendHtmlMessage(player, html);
@@ -402,7 +402,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
break;
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Provides additional MP recovery for clan members in the clan hall.<font color=\"00FFFF\">" + percent + "%</font>");
html.replace("%apply%", "recovery mp " + percent);
sendHtmlMessage(player, html);
@@ -454,7 +454,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
break;
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the clan hall.<font color=\"00FFFF\">" + percent + "%</font>");
html.replace("%apply%", "recovery exp " + percent);
sendHtmlMessage(player, html);
@@ -465,10 +465,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (st.countTokens() >= 1)
{
int fee;
if (Config.DEBUG)
{
_log.warning("Mp editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
@@ -575,10 +571,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (st.countTokens() >= 1)
{
int fee;
if (Config.DEBUG)
{
_log.warning("Mp editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
@@ -645,10 +637,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (st.countTokens() >= 1)
{
int fee;
if (Config.DEBUG)
{
_log.warning("Exp editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
@@ -737,7 +725,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
final String mp_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 30\">30%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>]";
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null)
{
html.replace("%hp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease() + "</font>Adena /" + Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%hp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease() + "</font>Adena /" + (Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getEndTime()));
final int grade = getClanHall().getGrade();
switch (grade)
@@ -795,7 +783,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null)
{
html.replace("%exp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease() + "</font>Adena /" + Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%exp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease() + "</font>Adena /" + (Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getEndTime()));
final int grade = getClanHall().getGrade();
switch (grade)
@@ -853,7 +841,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null)
{
html.replace("%mp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease() + "</font>Adena /" + Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%mp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease() + "</font>Adena /" + (Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getEndTime()));
final int grade = getClanHall().getGrade();
switch (grade)
@@ -971,7 +959,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
break;
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Allow the purchase of special items at fixed intervals.");
html.replace("%apply%", "other item " + stage);
sendHtmlMessage(player, html);
@@ -1028,7 +1016,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
break;
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Enables the use of supplementary magic.");
html.replace("%apply%", "other support " + stage);
sendHtmlMessage(player, html);
@@ -1055,7 +1043,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
break;
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Teleports clan members in a clan hall to the target <font color=\"00FFFF\">Stage " + stage + "</font> staging area");
html.replace("%apply%", "other tele " + stage);
sendHtmlMessage(player, html);
@@ -1070,10 +1058,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
player.sendMessage("This clan hall has no owner, you cannot change the configuration.");
return;
}
if (Config.DEBUG)
{
_log.warning("Item editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
@@ -1131,10 +1115,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (st.countTokens() >= 1)
{
int fee;
if (Config.DEBUG)
{
_log.warning("Tele editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
@@ -1186,10 +1166,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (st.countTokens() >= 1)
{
int fee;
if (Config.DEBUG)
{
_log.warning("Support editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
@@ -1277,7 +1253,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
final String item = "[<a action=\"bypass -h npc_%objectId%_manage other edit_item 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 2\">Level 2</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 3\">Level 3</a>]";
if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null)
{
html.replace("%tele%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease() + "</font>Adena /" + Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%tele%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease() + "</font>Adena /" + (Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getEndTime()));
html.replace("%change_tele%", "[<a action=\"bypass -h npc_%objectId%_manage other tele_cancel\">Deactivate</a>]" + tele);
}
@@ -1289,7 +1265,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) != null)
{
html.replace("%support%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease() + "</font>Adena /" + Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%support%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease() + "</font>Adena /" + (Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getEndTime()));
final int grade = getClanHall().getGrade();
switch (grade)
@@ -1347,7 +1323,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null)
{
html.replace("%item%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease() + "</font>Adena /" + Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%item%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease() + "</font>Adena /" + (Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%item_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getEndTime()));
html.replace("%change_item%", "[<a action=\"bypass -h npc_%objectId%_manage other item_cancel\">Deactivate</a>]" + item);
}
@@ -1406,7 +1382,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
break;
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "These curtains can be used to decorate the clan hall.");
html.replace("%apply%", "deco curtains " + stage);
sendHtmlMessage(player, html);
@@ -1433,7 +1409,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
break;
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Used to decorate the clan hall.");
html.replace("%apply%", "deco fixtures " + stage);
sendHtmlMessage(player, html);
@@ -1444,10 +1420,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (st.countTokens() >= 1)
{
int fee;
if (Config.DEBUG)
{
_log.warning("Deco curtains editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
@@ -1499,10 +1471,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (st.countTokens() >= 1)
{
int fee;
if (Config.DEBUG)
{
_log.warning("Deco fixtures editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
@@ -1556,7 +1524,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
final String fixtures = "[<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 2\">Level 2</a>]";
if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null)
{
html.replace("%curtain%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease() + "</font>Adena /" + Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%curtain%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease() + "</font>Adena /" + (Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%curtain_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getEndTime()));
html.replace("%change_curtain%", "[<a action=\"bypass -h npc_%objectId%_manage deco curtains_cancel\">Deactivate</a>]" + curtains);
}
@@ -1568,7 +1536,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) != null)
{
html.replace("%fixture%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease() + "</font>Adena /" + Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%fixture%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease() + "</font>Adena /" + (Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%fixture_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getEndTime()));
html.replace("%change_fixture%", "[<a action=\"bypass -h npc_%objectId%_manage deco fixtures_cancel\">Deactivate</a>]" + fixtures);
}
@@ -1788,10 +1756,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
private void doTeleport(L2PcInstance player, int val)
{
if (Config.DEBUG)
{
_log.warning("doTeleport(L2PcInstance player, int val) is called");
}
final L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val);
if (list != null)
{
@@ -1802,10 +1766,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
else if (player.destroyItemByItemId("Teleport", list.getItemId(), list.getPrice(), this, true))
{
if (Config.DEBUG)
{
_log.warning("Teleporting player " + player.getName() + " for CH to new location: " + list.getLocX() + ":" + list.getLocY() + ":" + list.getLocZ());
}
player.teleToLocation(list.getLocX(), list.getLocY(), list.getLocZ());
}
}

44
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java
View File

@@ -22,7 +22,6 @@ import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.ai.CtrlEvent;
import com.l2jmobius.gameserver.datatables.SkillData;
@@ -552,11 +551,6 @@ public final class L2CubicInstance implements IIdentifiable
final byte shld = Formulas.calcShldUse(_owner, target, skill);
int damage = (int) Formulas.calcMagicDam(this, target, skill, mcrit, shld);
if (Config.DEBUG)
{
_log.info("L2SkillMdam: useCubicSkill() -> damage = " + damage);
}
if (damage > 0)
{
// Manage attack or cast break of the target (calculating rate, sending message...)
@@ -582,11 +576,6 @@ public final class L2CubicInstance implements IIdentifiable
public void useCubicDrain(Skill skill, L2Object[] targets)
{
if (Config.DEBUG)
{
_log.info("L2SkillDrain: useCubicSkill()");
}
for (L2Character target : (L2Character[]) targets)
{
if (target.isAlikeDead())
@@ -598,10 +587,6 @@ public final class L2CubicInstance implements IIdentifiable
final byte shld = Formulas.calcShldUse(_owner, target, skill);
final int damage = (int) Formulas.calcMagicDam(this, target, skill, mcrit, shld);
if (Config.DEBUG)
{
_log.info("L2SkillDrain: useCubicSkill() -> damage = " + damage);
}
// TODO: Unhardcode fixed value
final double hpAdd = (0.4 * damage);
@@ -628,11 +613,6 @@ public final class L2CubicInstance implements IIdentifiable
public void useCubicDisabler(Skill skill, L2Object[] targets)
{
if (Config.DEBUG)
{
_log.info("Disablers: useCubicSkill()");
}
for (L2Character target : (L2Character[]) targets)
{
if ((target == null) || target.isDead())
@@ -654,18 +634,6 @@ public final class L2CubicInstance implements IIdentifiable
{
DuelManager.getInstance().onBuff(target.getActingPlayer(), skill);
}
if (Config.DEBUG)
{
_log.info("Disablers: useCubicSkill() -> success");
}
}
else
{
if (Config.DEBUG)
{
_log.info("Disablers: useCubicSkill() -> failed");
}
}
}
@@ -680,18 +648,6 @@ public final class L2CubicInstance implements IIdentifiable
// Apply effects
skill.applyEffects(_owner, target, false, false, true, 0);
if (Config.DEBUG)
{
_log.info("Disablers: useCubicSkill() -> success");
}
}
else
{
if (Config.DEBUG)
{
_log.info("Disablers: useCubicSkill() -> failed");
}
}
}
}

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.gameserver.model.actor.instance;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.ai.L2CharacterAI;
import com.l2jmobius.gameserver.ai.L2FortSiegeGuardAI;
@@ -129,10 +128,6 @@ public class L2DefenderInstance extends L2Attackable
}
if (!isInsideRadius(getSpawn(), 40, false, false))
{
if (Config.DEBUG)
{
_log.info(getObjectId() + ": moving home");
}
setisReturningToSpawnPoint(true);
clearAggroList();
@@ -172,11 +167,6 @@ public class L2DefenderInstance extends L2Attackable
// Check if the L2PcInstance already target the L2NpcInstance
if (this != player.getTarget())
{
if (Config.DEBUG)
{
_log.info("new target selected:" + getObjectId());
}
// Set the target of the L2PcInstance player
player.setTarget(this);
}

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java
View File

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance;
import java.util.List;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.enums.ChatType;
@@ -105,10 +104,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance
{
if (!isInsideRadius(getSpawn(), 200, false, false))
{
if (Config.DEBUG)
{
_log.info(getObjectId() + ": moving home");
}
setisReturningToSpawnPoint(true);
clearAggroList();

48
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java
View File

@@ -418,7 +418,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Provides additional HP recovery for clan members in the fortress.<font color=\"00FFFF\">" + percent + "%</font>");
html.replace("%apply%", "recovery hp " + percent);
sendHtmlMessage(player, html);
@@ -445,7 +445,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
break;
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Provides additional MP recovery for clan members in the fortress.<font color=\"00FFFF\">" + percent + "%</font>");
html.replace("%apply%", "recovery mp " + percent);
sendHtmlMessage(player, html);
@@ -472,7 +472,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
break;
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the fortress.<font color=\"00FFFF\">" + percent + "%</font>");
html.replace("%apply%", "recovery exp " + percent);
sendHtmlMessage(player, html);
@@ -483,10 +483,6 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (st.countTokens() >= 1)
{
int fee;
if (Config.DEBUG)
{
_log.warning("Mp editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
@@ -534,10 +530,6 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (st.countTokens() >= 1)
{
int fee;
if (Config.DEBUG)
{
_log.warning("Mp editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
@@ -585,10 +577,6 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (st.countTokens() >= 1)
{
int fee;
if (Config.DEBUG)
{
_log.warning("Exp editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
@@ -639,7 +627,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
final String mp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 50\">50%</a>]";
if (getFort().getFunction(Fort.FUNC_RESTORE_HP) != null)
{
html.replace("%hp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease() + "</font>Adena /" + Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%hp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease() + "</font>Adena /" + (Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_HP).getEndTime()));
html.replace("%change_hp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery hp_cancel\">Deactivate</a>]" + hp);
}
@@ -651,7 +639,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (getFort().getFunction(Fort.FUNC_RESTORE_EXP) != null)
{
html.replace("%exp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLease() + "</font>Adena /" + Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%exp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLease() + "</font>Adena /" + (Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getEndTime()));
html.replace("%change_exp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery exp_cancel\">Deactivate</a>]" + exp);
}
@@ -663,7 +651,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (getFort().getFunction(Fort.FUNC_RESTORE_MP) != null)
{
html.replace("%mp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_RESTORE_MP).getLease() + "</font>Adena /" + Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%mp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_RESTORE_MP).getLease() + "</font>Adena /" + (Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_MP).getEndTime()));
html.replace("%change_mp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery mp_cancel\">Deactivate</a>]" + mp);
}
@@ -722,7 +710,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
break;
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Enables the use of supplementary magic.");
html.replace("%apply%", "other support " + stage);
sendHtmlMessage(player, html);
@@ -749,7 +737,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
break;
}
}
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + (Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Teleports clan members in a fort to the target <font color=\"00FFFF\">Stage " + stage + "</font> staging area");
html.replace("%apply%", "other tele " + stage);
sendHtmlMessage(player, html);
@@ -760,10 +748,6 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (st.countTokens() >= 1)
{
int fee;
if (Config.DEBUG)
{
_log.warning("Tele editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
@@ -811,10 +795,6 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (st.countTokens() >= 1)
{
int fee;
if (Config.DEBUG)
{
_log.warning("Support editing invoked");
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
@@ -867,7 +847,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
final String support = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>]";
if (getFort().getFunction(Fort.FUNC_TELEPORT) != null)
{
html.replace("%tele%", "Stage " + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_TELEPORT).getLease() + "</font>Adena /" + Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%tele%", "Stage " + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_TELEPORT).getLease() + "</font>Adena /" + (Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_TELEPORT).getEndTime()));
html.replace("%change_tele%", "[<a action=\"bypass -h npc_%objectId%_manage other tele_cancel\">Deactivate</a>]" + tele);
}
@@ -879,7 +859,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (getFort().getFunction(Fort.FUNC_SUPPORT) != null)
{
html.replace("%support%", "Stage " + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_SUPPORT).getLease() + "</font>Adena /" + Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%support%", "Stage " + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_SUPPORT).getLease() + "</font>Adena /" + (Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_SUPPORT).getEndTime()));
html.replace("%change_support%", "[<a action=\"bypass -h npc_%objectId%_manage other support_cancel\">Deactivate</a>]" + support);
}
@@ -1022,19 +1002,11 @@ public class L2FortManagerInstance extends L2MerchantInstance
private void doTeleport(L2PcInstance player, int val)
{
if (Config.DEBUG)
{
_log.warning("doTeleport(L2PcInstance player, int val) is called");
}
final L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val);
if (list != null)
{
if (player.destroyItemByItemId("Teleport", list.getItemId(), list.getPrice(), this, true))
{
if (Config.DEBUG)
{
_log.warning("Teleporting player " + player.getName() + " for Fortress to new location: " + list.getLocX() + ":" + list.getLocY() + ":" + list.getLocZ());
}
player.teleToLocation(list.getLocX(), list.getLocY(), list.getLocZ());
}
}

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java
View File

@@ -16,9 +16,6 @@
*/
package com.l2jmobius.gameserver.model.actor.instance;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.model.L2World;
@@ -39,8 +36,6 @@ import com.l2jmobius.util.Rnd;
*/
public class L2GuardInstance extends L2Attackable
{
private static Logger _log = Logger.getLogger(L2GuardInstance.class.getName());
/**
* Creates a guard.
* @param template the guard NPC template
@@ -153,11 +148,6 @@ public class L2GuardInstance extends L2Attackable
// Check if the L2PcInstance is in the _aggroList of the L2GuardInstance
if (isInAggroList(player))
{
if (Config.DEBUG)
{
_log.fine(player.getObjectId() + ": Attacked guard " + getObjectId());
}
// Set the L2PcInstance Intention to AI_INTENTION_ATTACK
player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
}

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java
View File

@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance;
import java.util.List;
import java.util.Map;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import com.l2jmobius.gameserver.datatables.SkillData;
import com.l2jmobius.gameserver.enums.InstanceType;
@@ -73,11 +72,6 @@ public class L2NpcInstance extends L2Npc
*/
public static void showSkillList(L2PcInstance player, L2Npc npc, ClassId classId)
{
if (Config.DEBUG)
{
_log.fine("SkillList activated on: " + npc.getObjectId());
}
final int npcId = npc.getTemplate().getId();
if (npcId == 32611) // Tolonis (Officer)
{

18
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -3853,20 +3853,11 @@ public final class L2PcInstance extends L2Playable
// Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting
if ((hasSummon() && (getSummon().getControlObjectId() == objectId)) || (getMountObjectID() == objectId))
{
if (Config.DEBUG)
{
_log.finest(getObjectId() + ": player tried to " + action + " item controling pet");
}
return null;
}
if (getActiveEnchantItemId() == objectId)
{
if (Config.DEBUG)
{
_log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using");
}
return null;
}
@@ -10910,20 +10901,11 @@ public final class L2PcInstance extends L2Playable
// Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting
if ((hasSummon() && (getSummon().getControlObjectId() == objectId)) || (getMountObjectID() == objectId))
{
if (Config.DEBUG)
{
_log.finest(getObjectId() + ": player tried to " + action + " item controling pet");
}
return false;
}
if (getActiveEnchantItemId() == objectId)
{
if (Config.DEBUG)
{
_log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using");
}
return false;
}

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java
View File

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance;
import java.util.concurrent.Future;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.data.xml.impl.DoorData;
@@ -118,11 +117,6 @@ public class L2SepulcherNpcInstance extends L2Npc
// Check if the L2PcInstance already target the L2NpcInstance
if (this != player.getTarget())
{
if (Config.DEBUG)
{
_log.info("new target selected:" + getObjectId());
}
// Set the target of the L2PcInstance player
player.setTarget(this);
}

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java
View File

@@ -302,11 +302,6 @@ public final class L2TeleporterInstance extends L2Npc
if (Config.FREE_TELEPORTING || player.destroyItemByItemId("Teleport " + (list.getIsForNoble() ? " nobless" : ""), list.getItemId(), price, this, true))
{
if (Config.DEBUG)
{
_log.info("Teleporting player " + player.getName() + " to new location: " + list.getLocX() + ":" + list.getLocY() + ":" + list.getLocZ());
}
player.teleToLocation(list.getLocX(), list.getLocY(), list.getLocZ(), player.getHeading(), -1);
}
}

14
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardKnownList.java
View File

@@ -16,8 +16,6 @@
*/
package com.l2jmobius.gameserver.model.actor.knownlist;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.model.L2Object;
@@ -26,8 +24,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
public class GuardKnownList extends AttackableKnownList
{
private static final Logger _log = Logger.getLogger(GuardKnownList.class.getName());
public GuardKnownList(L2GuardInstance activeChar)
{
super(activeChar);
@@ -46,11 +42,6 @@ public class GuardKnownList extends AttackableKnownList
// Check if the object added is a L2PcInstance that owns Karma
if (object.getActingPlayer().getKarma() > 0)
{
if (Config.DEBUG)
{
_log.fine(getActiveChar().getObjectId() + ": PK " + object.getObjectId() + " entered scan range");
}
// Set the L2GuardInstance Intention to AI_INTENTION_ACTIVE
if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)
{
@@ -63,11 +54,6 @@ public class GuardKnownList extends AttackableKnownList
// Check if the object added is an aggressive L2MonsterInstance
if (((L2MonsterInstance) object).isAggressive())
{
if (Config.DEBUG)
{
_log.fine(getActiveChar().getObjectId() + ": Aggressive mob " + object.getObjectId() + " entered scan range");
}
// Set the L2GuardInstance Intention to AI_INTENTION_ACTIVE
if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)
{

16
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java
View File

@@ -22,7 +22,6 @@ import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -171,11 +170,6 @@ public class CharStatus
getActiveChar().abortAttack();
getActiveChar().abortCast();
if (Config.DEBUG)
{
_log.fine("char is dead.");
}
getActiveChar().doDie(attacker);
}
}
@@ -197,11 +191,6 @@ public class CharStatus
{
if ((_regTask == null) && !getActiveChar().isDead())
{
if (Config.DEBUG)
{
_log.fine("HP/MP regen started");
}
// Get the Regeneration period
final int period = Formulas.getRegeneratePeriod(getActiveChar());
@@ -222,11 +211,6 @@ public class CharStatus
{
if (_regTask != null)
{
if (Config.DEBUG)
{
_log.fine("HP/MP regen stop");
}
// Stop the HP/MP/CP Regeneration task
_regTask.cancel(false);
_regTask = null;

35
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicAction.java
View File

@@ -20,7 +20,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.instance.L2CubicInstance;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
@@ -138,12 +137,6 @@ public final class CubicAction implements Runnable
final L2Character target = _cubic.getTarget();
if ((target != null) && !target.isDead())
{
if (Config.DEBUG)
{
_log.info("L2CubicInstance: Action.run();");
_log.info("Cubic ID: " + _cubic.getId() + " Target: " + target.getName() + " distance: " + target.calculateDistance(_cubic.getOwner(), true, false));
}
_cubic.getOwner().broadcastPacket(new MagicSkillUse(_cubic.getOwner(), target, skill.getId(), skill.getLevel(), 0, 0));
final L2Character[] targets =
@@ -153,59 +146,31 @@ public final class CubicAction implements Runnable
if (skill.isContinuous())
{
if (Config.DEBUG)
{
_log.info("L2CubicInstance: Action.run() skill " + skill);
}
_cubic.useCubicContinuous(skill, targets);
}
else
{
skill.activateSkill(_cubic, targets);
if (Config.DEBUG)
{
_log.info("L2CubicInstance: Action.run(); other handler");
}
}
if (skill.hasEffectType(L2EffectType.MAGICAL_ATTACK))
{
if (Config.DEBUG)
{
_log.info("L2CubicInstance: Action.run() skill " + skill);
}
_cubic.useCubicMdam(skill, targets);
}
else if (skill.hasEffectType(L2EffectType.HP_DRAIN))
{
if (Config.DEBUG)
{
_log.info("L2CubicInstance: Action.run() skill " + skill);
}
_cubic.useCubicDrain(skill, targets);
}
else if (skill.hasEffectType(L2EffectType.STUN, L2EffectType.ROOT, L2EffectType.PARALYZE))
{
if (Config.DEBUG)
{
_log.info("L2CubicInstance: Action.run() skill " + skill);
}
_cubic.useCubicDisabler(skill, targets);
}
else if (skill.hasEffectType(L2EffectType.DMG_OVER_TIME, L2EffectType.DMG_OVER_TIME_PERCENT))
{
if (Config.DEBUG)
{
_log.info("L2CubicInstance: Action.run() skill " + skill);
}
_cubic.useCubicContinuous(skill, targets);
}
else if (skill.hasEffectType(L2EffectType.AGGRESSION))
{
if (Config.DEBUG)
{
_log.info("L2CubicInstance: Action.run() skill " + skill);
}
_cubic.useCubicDisabler(skill, targets);
}

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
View File

@@ -25,7 +25,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.datatables.SkillData;
import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -305,11 +304,6 @@ public final class BlockCheckerEngine
_abnormalEnd = true;
ThreadPoolManager.execute(new EndEvent());
if (Config.DEBUG)
{
_log.config("Handys Block Checker Event at arena " + _arena + " ended due lack of players!");
}
}
}
catch (Exception e)

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1327,11 +1327,6 @@ public abstract class Inventory extends ItemContainer
*/
public L2ItemInstance unEquipItemInBodySlot(int slot)
{
if (Config.DEBUG)
{
_log.info(Inventory.class.getSimpleName() + ": Unequip body slot:" + slot);
}
int pdollSlot = -1;
switch (slot)

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -273,10 +273,6 @@ public final class Skill implements IIdentifiable
if (Config.ENABLE_MODIFY_SKILL_REUSE && Config.SKILL_REUSE_LIST.containsKey(_id))
{
if (Config.DEBUG)
{
_log.info("*** Skill " + _name + " (" + _level + ") changed reuse from " + set.getInt("reuseDelay", 0) + " to " + Config.SKILL_REUSE_LIST.get(_id) + " seconds.");
}
_reuseDelay = Config.SKILL_REUSE_LIST.get(_id);
}
else

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.SevenSigns;
@@ -84,8 +83,6 @@ import com.l2jmobius.util.Rnd;
*/
public final class Formulas
{
private static final Logger _log = Logger.getLogger(Formulas.class.getName());
/** Regeneration Task period. */
private static final int HP_REGENERATE_PERIOD = 3000; // 3 secs
@@ -520,11 +517,6 @@ public final class Formulas
// Check the distance between the player and the player spawn point, in the center of the arena.
final double distToCenter = activeChar.calculateDistance(festivalCenter[0], festivalCenter[1], 0, false, false);
if (Config.DEBUG)
{
_log.info("Distance: " + distToCenter + ", RegenMulti: " + ((distToCenter * 2.5) / 50));
}
return 1.0 - (distToCenter * 0.0005); // Maximum Decreased Regen of ~ -65%;
}

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Action.java
View File

@@ -32,8 +32,11 @@ public final class Action extends L2GameClientPacket
private static final String __C__1F_ACTION = "[C] 1F Action";
private int _objectId;
@SuppressWarnings("unused")
private int _originX;
@SuppressWarnings("unused")
private int _originY;
@SuppressWarnings("unused")
private int _originZ;
private int _actionId;
@@ -50,11 +53,6 @@ public final class Action extends L2GameClientPacket
@Override
protected void runImpl()
{
if (Config.DEBUG)
{
_log.info(getType() + ": " + (_actionId == 0 ? "Simple-click" : "Shift-click") + " Target object ID: " + _objectId + " orignX: " + _originX + " orignY: " + _originY + " orignZ: " + _originZ);
}
// Get the current L2PcInstance of the player
final L2PcInstance activeChar = getActiveChar();
if (activeChar == null)

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.LoginServerThread;
import com.l2jmobius.gameserver.LoginServerThread.SessionKey;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -60,11 +59,6 @@ public final class AuthLogin extends L2GameClientPacket
return;
}
final SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2);
if (Config.DEBUG)
{
_log.info("user:" + _loginName);
_log.info("key:" + key);
}
// avoid potential exploits
if (client.getAccountName() == null)

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlEvent;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -52,10 +51,6 @@ public final class CannotMoveAnymore extends L2GameClientPacket
return;
}
if (Config.DEBUG)
{
_log.fine("client: x:" + _x + " y:" + _y + " z:" + _z + " server x:" + player.getX() + " y:" + player.getY() + " z:" + player.getZ());
}
if (player.getAI() != null)
{
player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading));

40
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
View File

@@ -99,11 +99,6 @@ public final class CharacterCreate extends L2GameClientPacket
// Last Verified: May 30, 2009 - Gracia Final - Players are able to create characters with names consisting of as little as 1,2,3 letter/number combinations.
if ((_name.length() < 1) || (_name.length() > 16))
{
if (Config.DEBUG)
{
_log.fine("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Your title cannot exceed 16 characters in length. Please try again.");
}
sendPacket(new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS));
return;
}
@@ -123,11 +118,6 @@ public final class CharacterCreate extends L2GameClientPacket
// Last Verified: May 30, 2009 - Gracia Final
if (!Util.isAlphaNumeric(_name) || !isValidName(_name))
{
if (Config.DEBUG)
{
_log.fine("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Incorrect name. Please try again.");
}
sendPacket(new CharCreateFail(CharCreateFail.REASON_INCORRECT_NAME));
return;
}
@@ -166,21 +156,11 @@ public final class CharacterCreate extends L2GameClientPacket
{
if ((CharNameTable.getInstance().getAccountCharacterCount(getClient().getAccountName()) >= Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT) && (Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT != 0))
{
if (Config.DEBUG)
{
_log.fine("Max number of characters reached. Creation failed.");
}
sendPacket(new CharCreateFail(CharCreateFail.REASON_TOO_MANY_CHARACTERS));
return;
}
else if (CharNameTable.getInstance().doesCharNameExist(_name))
{
if (Config.DEBUG)
{
_log.fine("Character Creation Failure: Message generated: You cannot create another character. Please delete the existing character and try again.");
}
sendPacket(new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS));
return;
}
@@ -188,11 +168,6 @@ public final class CharacterCreate extends L2GameClientPacket
template = PlayerTemplateData.getInstance().getTemplate(_classId);
if ((template == null) || (ClassId.getClassId(_classId).level() > 0))
{
if (Config.DEBUG)
{
_log.fine("Character Creation Failure: " + _name + " classId: " + _classId + " Template: " + template + " Message generated: Your character creation has failed.");
}
sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED));
return;
}
@@ -243,11 +218,6 @@ public final class CharacterCreate extends L2GameClientPacket
private void initNewChar(L2GameClient client, L2PcInstance newChar)
{
if (Config.DEBUG)
{
_log.fine("Character init start");
}
L2World.getInstance().storeObject(newChar);
if (Config.STARTING_ADENA > 0)
@@ -304,11 +274,6 @@ public final class CharacterCreate extends L2GameClientPacket
for (L2SkillLearn skill : SkillTreesData.getInstance().getAvailableSkills(newChar, newChar.getClassId(), false, true))
{
if (Config.DEBUG)
{
_log.fine("Adding starter skill:" + skill.getSkillId() + " / " + skill.getSkillLevel());
}
newChar.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true);
}
@@ -327,11 +292,6 @@ public final class CharacterCreate extends L2GameClientPacket
final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1);
client.setCharSelection(cl.getCharInfo());
if (Config.DEBUG)
{
_log.fine("Character init end");
}
}
/**

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java
View File

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Level;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.CharSelectInfoPackage;
import com.l2jmobius.gameserver.model.events.Containers;
import com.l2jmobius.gameserver.model.events.EventDispatcher;
@@ -53,11 +52,6 @@ public final class CharacterDelete extends L2GameClientPacket
// return;
// }
if (Config.DEBUG)
{
_log.fine("deleting slot:" + _charSlot);
}
try
{
switch (getClient().markToDeleteChar(_charSlot))

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
View File

@@ -126,12 +126,6 @@ public class CharacterSelect extends L2GameClientPacket
return;
}
// The L2PcInstance must be created here, so that it can be attached to the L2GameClient
if (Config.DEBUG)
{
_log.fine("selected slot:" + _charSlot);
}
// load up character from disk
final L2PcInstance cha = client.loadCharFromDisk(_charSlot);
if (cha == null)

11
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@@ -156,13 +156,10 @@ public class EnterWorld extends L2GameClientPacket
}
}
if (L2World.getInstance().findObject(activeChar.getObjectId()) != null)
{
if (Config.DEBUG)
{
_log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone.");
}
}
// if (L2World.getInstance().findObject(activeChar.getObjectId()) != null)
// {
// _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone.");
// }
// Apply special GM properties to the GM when entering
if (activeChar.isGM())

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/L2GameClientPacket.java
View File

@@ -20,7 +20,6 @@ import java.nio.BufferUnderflowException;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.mmocore.ReceivablePacket;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -75,10 +74,6 @@ public abstract class L2GameClientPacket extends ReceivablePacket<L2GameClient>
if ((actor != null) && (actor.isSpawnProtected() || actor.isInvul()))
{
actor.onActionRequest();
if (Config.DEBUG)
{
_log.info("Spawn protection for player " + actor.getName() + " removed by packet: " + getType());
}
}
}
}

9
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java
View File

@@ -55,10 +55,6 @@ public final class Logout extends L2GameClientPacket
if ((player.getActiveEnchantItemId() != L2PcInstance.ID_NONE) || (player.getActiveEnchantAttrItemId() != L2PcInstance.ID_NONE))
{
if (Config.DEBUG)
{
_log.fine("Player " + player.getName() + " tried to logout while enchanting.");
}
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -78,11 +74,6 @@ public final class Logout extends L2GameClientPacket
return;
}
if (Config.DEBUG)
{
_log.fine("Player " + player.getName() + " tried to logout while fighting.");
}
player.sendPacket(SystemMessageId.YOU_CANNOT_EXIT_THE_GAME_WHILE_IN_COMBAT);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.PlayerTemplateData;
import com.l2jmobius.gameserver.model.base.ClassId;
import com.l2jmobius.gameserver.network.serverpackets.NewCharacterSuccess;
@@ -37,11 +36,6 @@ public final class NewCharacter extends L2GameClientPacket
@Override
protected void runImpl()
{
if (Config.DEBUG)
{
_log.fine(_C__13_NEWCHARACTER);
}
final NewCharacterSuccess ct = new NewCharacterSuccess();
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.fighter)); // Human Figther
ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.mage)); // Human Mystic

9
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java
View File

@@ -47,10 +47,6 @@ public final class ProtocolVersion extends L2GameClientPacket
// this packet is never encrypted
if (_version == -2)
{
if (Config.DEBUG)
{
_log.info("Ping received");
}
// this is just a ping attempt from the new C2 client
getClient().close((L2GameServerPacket) null);
}
@@ -69,11 +65,6 @@ public final class ProtocolVersion extends L2GameClientPacket
}
else
{
if (Config.DEBUG)
{
_log.fine("Client Protocol Revision is ok: " + _version);
}
final KeyPacket pk = new KeyPacket(getClient().enableCrypt(), 1);
getClient().sendPacket(pk);
getClient().setProtocolOk(true);

13
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
View File

@@ -95,11 +95,6 @@ public final class RequestActionUse extends L2GameClientPacket
return;
}
if (Config.DEBUG)
{
_log.info(getType() + ": " + activeChar + " requested action use ID: " + _actionId + " Ctrl pressed:" + _ctrlPressed + " Shift pressed:" + _shiftPressed);
}
// Don't do anything if player is dead or confused
if ((activeChar.isFakeDeath() && (_actionId != 0)) || activeChar.isDead() || activeChar.isOutOfControl())
{
@@ -1055,14 +1050,6 @@ public final class RequestActionUse extends L2GameClientPacket
tryBroadcastSocial(15);
break;
}
default:
{
if (Config.DEBUG)
{
_log.warning(activeChar.getName() + ": unhandled action type " + _actionId);
}
break;
}
}
}

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.PrivateStoreType;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
@@ -54,11 +53,6 @@ public final class RequestAutoSoulShot extends L2GameClientPacket
if ((activeChar.getPrivateStoreType() == PrivateStoreType.NONE) && (activeChar.getActiveRequester() == null) && !activeChar.isDead())
{
if (Config.DEBUG)
{
_log.fine("AutoSoulShot:" + _itemId);
}
final L2ItemInstance item = activeChar.getInventory().getItemByItemId(_itemId);
if (item == null)
{

18
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
View File

@@ -157,20 +157,12 @@ public final class RequestDropItem extends L2GameClientPacket
if ((L2Item.TYPE2_QUEST == item.getItem().getType2()) && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS))
{
if (Config.DEBUG)
{
_log.finest(activeChar.getObjectId() + ":player tried to drop quest item");
}
activeChar.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED_OR_EXCHANGED);
return;
}
if (!activeChar.isInsideRadius(_x, _y, 0, 150, false, false) || (Math.abs(_z - activeChar.getZ()) > 50))
{
if (Config.DEBUG)
{
_log.finest(activeChar.getObjectId() + ": trying to drop too far away");
}
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DISCARD_SOMETHING_THAT_FAR_AWAY_FROM_YOU);
return;
}
@@ -181,11 +173,6 @@ public final class RequestDropItem extends L2GameClientPacket
return;
}
if (Config.DEBUG)
{
_log.fine("requested drop item " + _objectId + "(" + item.getCount() + ") at " + _x + "/" + _y + "/" + _z);
}
if (item.isEquipped())
{
final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot());
@@ -204,11 +191,6 @@ public final class RequestDropItem extends L2GameClientPacket
final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false);
if (Config.DEBUG)
{
_log.fine("dropping " + _objectId + " item(" + _count + ") at: " + _x + " " + _y + " " + _z);
}
// activeChar.broadcastUserInfo();
if (activeChar.isGM())

11
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -134,11 +133,6 @@ public final class RequestDuelStart extends L2GameClientPacket
activeChar.onTransactionRequest(partyLeader);
partyLeader.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel));
if (Config.DEBUG)
{
_log.fine(activeChar.getName() + " requested a duel with " + partyLeader.getName());
}
SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_S_PARTY_HAS_BEEN_CHALLENGED_TO_A_DUEL);
msg.addString(partyLeader.getName());
activeChar.sendPacket(msg);
@@ -163,11 +157,6 @@ public final class RequestDuelStart extends L2GameClientPacket
activeChar.onTransactionRequest(targetChar);
targetChar.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel));
if (Config.DEBUG)
{
_log.fine(activeChar.getName() + " requested a duel with " + targetChar.getName());
}
SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_CHALLENGED_TO_A_DUEL);
msg.addString(targetChar.getName());
activeChar.sendPacket(msg);

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
View File

@@ -166,11 +166,6 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_WAS_SUCCESSFUL_S1_HAS_BEEN_ENCHANTED);
sm.addSkillName(_skillId);
player.sendPacket(sm);
if (Config.DEBUG)
{
_log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requiredAdena + " Adena.");
}
}
else
{

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java
View File

@@ -183,11 +183,6 @@ public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket
player.sendPacket(ExEnchantSkillResult.valueOf(true));
}
if (Config.DEBUG)
{
_log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requireditems + " Adena.");
}
player.sendPacket(new UserInfo(player));
player.sendPacket(new ExBrExtraUserInfo(player));

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java
View File

@@ -160,11 +160,6 @@ public final class RequestExEnchantSkillSafe extends L2GameClientPacket
player.addSkill(skill, true);
if (Config.DEBUG)
{
_log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requireditems + " Adena.");
}
player.sendPacket(ExEnchantSkillResult.valueOf(true));
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_WAS_SUCCESSFUL_S1_HAS_BEEN_ENCHANTED);

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java
View File

@@ -166,11 +166,6 @@ public final class RequestExEnchantSkillUntrain extends L2GameClientPacket
player.addSkill(skill, true);
player.sendPacket(ExEnchantSkillResult.valueOf(true));
if (Config.DEBUG)
{
_log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requireditems + " Adena.");
}
player.sendPacket(new UserInfo(player));
player.sendPacket(new ExBrExtraUserInfo(player));

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
@@ -51,13 +50,6 @@ public class RequestExRqItemLink extends L2GameClientPacket
{
client.sendPacket(new ExRpItemLink(item));
}
else
{
if (Config.DEBUG)
{
_log.info(getClient() + " requested item link for item which wasnt published! ID:" + _objectId);
}
}
}
}
}

23
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.PartyDistributionType;
import com.l2jmobius.gameserver.model.BlockList;
import com.l2jmobius.gameserver.model.L2Party;
@@ -184,23 +183,12 @@ public final class RequestJoinParty extends L2GameClientPacket
// in case a leader change has happened, use party's mode
target.sendPacket(new AskJoinParty(requestor.getName(), party.getDistributionType()));
party.setPendingInvitation(true);
if (Config.DEBUG)
{
_log.fine("sent out a party invitation to:" + target.getName());
}
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(target.getName());
requestor.sendPacket(sm);
if (Config.DEBUG)
{
_log.warning(requestor.getName() + " already received a party invitation");
}
}
}
@@ -222,21 +210,10 @@ public final class RequestJoinParty extends L2GameClientPacket
target.setActiveRequester(requestor);
requestor.onTransactionRequest(target);
requestor.setPartyDistributionType(partyDistributionType);
if (Config.DEBUG)
{
_log.fine("sent out a party invitation to:" + target.getName());
}
}
else
{
requestor.sendPacket(SystemMessageId.WAITING_FOR_ANOTHER_REPLY);
if (Config.DEBUG)
{
_log.warning(requestor.getName() + " already received a party invitation");
}
}
}

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java
View File

@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.List;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.MacroType;
import com.l2jmobius.gameserver.model.Macro;
import com.l2jmobius.gameserver.model.MacroCmd;
@@ -49,11 +48,6 @@ public final class RequestMakeMacro extends L2GameClientPacket
_count = MAX_MACRO_LENGTH;
}
if (Config.DEBUG)
{
_log.info("Make macro id:" + _id + "\tname:" + _name + "\tdesc:" + _desc + "\tacronym:" + _acronym + "\ticon:" + _icon + "\tcount:" + _count);
}
final List<MacroCmd> commands = new ArrayList<>(_count);
for (int i = 0; i < _count; i++)
{

12
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
View File

@@ -16,9 +16,6 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Level;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -39,11 +36,6 @@ public final class RequestPledgeInfo extends L2GameClientPacket
@Override
protected void runImpl()
{
if (Config.DEBUG)
{
_log.log(Level.FINE, "Info for clan " + _clanId + " requested");
}
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{
@@ -53,10 +45,6 @@ public final class RequestPledgeInfo extends L2GameClientPacket
final L2Clan clan = ClanTable.getInstance().getClan(_clanId);
if (clan == null)
{
if (Config.DEBUG)
{
_log.warning(getType() + ": Clan data for clanId " + _clanId + " is missing for player " + activeChar);
}
return; // we have no clan data ?!? should not happen
}

15
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.Quest;
@@ -57,20 +56,6 @@ public final class RequestQuestAbort extends L2GameClientPacket
qs.exitQuest(true);
activeChar.sendPacket(new QuestList());
}
else
{
if (Config.DEBUG)
{
_log.info("Player '" + activeChar.getName() + "' try to abort quest " + qe.getName() + " but he didn't have it started.");
}
}
}
else
{
if (Config.DEBUG)
{
_log.warning("Quest (id='" + _questId + "') not found.");
}
}
}

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.RecipeController;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -31,10 +30,6 @@ public final class RequestRecipeBookOpen extends L2GameClientPacket
protected void readImpl()
{
_isDwarvenCraft = (readD() == 0);
if (Config.DEBUG)
{
_log.info("RequestRecipeBookOpen : " + (_isDwarvenCraft ? "dwarvenCraft" : "commonCraft"));
}
}
@Override

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
View File

@@ -80,11 +80,6 @@ public final class RequestRestart extends L2GameClientPacket
if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && !(player.isGM() && Config.GM_RESTART_FIGHTING))
{
if (Config.DEBUG)
{
_log.fine("Player " + player.getName() + " tried to logout while fighting.");
}
player.sendPacket(SystemMessageId.YOU_CANNOT_RESTART_WHILE_IN_COMBAT);
sendPacket(RestartResponse.valueOf(false));
return;

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
View File

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets;
import java.util.Arrays;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.PcCondOverride;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.items.L2EtcItem;
@@ -49,11 +48,6 @@ public class RequestUnEquipItem extends L2GameClientPacket
@Override
protected void runImpl()
{
if (Config.DEBUG)
{
_log.fine("Request unequip slot " + _slot);
}
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@@ -99,11 +99,6 @@ public final class Say2 extends L2GameClientPacket
@Override
protected void runImpl()
{
if (Config.DEBUG)
{
_log.info("Say2: Msg Type = '" + _type + "' Text = '" + _text + "'.");
}
final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar == null)
{

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.TradeList;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -53,10 +52,6 @@ public final class TradeDone extends L2GameClientPacket
final TradeList trade = player.getActiveTradeList();
if (trade == null)
{
if (Config.DEBUG)
{
_log.warning("player.getTradeList == null in " + getType() + " for player " + player.getName());
}
return;
}

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
View File

@@ -147,10 +147,6 @@ public final class TradeRequest extends L2GameClientPacket
if (player.isProcessingTransaction())
{
if (Config.DEBUG)
{
_log.fine("Already trading with someone else.");
}
player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -158,10 +154,6 @@ public final class TradeRequest extends L2GameClientPacket
SystemMessage sm;
if (partner.isProcessingRequest() || partner.isProcessingTransaction())
{
if (Config.DEBUG)
{
_log.info("Transaction already in progress.");
}
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
player.sendPacket(sm);

9
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@@ -91,11 +91,6 @@ public final class UseItem extends L2GameClientPacket
return;
}
if (Config.DEBUG)
{
_log.log(Level.INFO, activeChar + ": use item " + _objectId);
}
// Flood protect UseItem
if (!getClient().getFloodProtectors().getUseItem().tryPerformAction("use item"))
{
@@ -346,10 +341,6 @@ public final class UseItem extends L2GameClientPacket
{
_log.log(Level.WARNING, "Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!");
}
else if (Config.DEBUG)
{
_log.log(Level.WARNING, "No Item handler registered for Item Id: " + _itemId + "!");
}
return;
}

24
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jmobius.gameserver.network.serverpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.SevenSigns;
import com.l2jmobius.gameserver.SevenSignsFestival;
import com.l2jmobius.gameserver.model.StatsSet;
@@ -140,24 +139,6 @@ public class SSQStatus extends L2GameServerPacket
duskPercent = Math.round(((float) duskTotalScore / (float) totalOverallScore) * 100);
}
if (Config.DEBUG)
{
_log.info("Dusk Stone Score: " + duskStoneScore + " - Dawn Stone Score: " + dawnStoneScore);
_log.info("Dusk Festival Score: " + duskFestivalScore + " - Dawn Festival Score: " + dawnFestivalScore);
_log.info("Dusk Score: " + duskTotalScore + " - Dawn Score: " + dawnTotalScore);
_log.info("Overall Score: " + totalOverallScore);
_log.info("");
if (totalStoneScore == 0)
{
_log.info("Dusk Prop: 0 - Dawn Prop: 0");
}
else
{
_log.info("Dusk Prop: " + ((duskStoneScore / totalStoneScore) * 500) + " - Dawn Prop: " + ((dawnStoneScore / totalStoneScore) * 500));
}
_log.info("Dusk %: " + duskPercent + " - Dawn %: " + dawnPercent);
}
/* DUSK */
writeQ(duskStoneScoreProp); // Seal Stone Score
writeQ(duskFestivalScore); // Festival Score
@@ -242,11 +223,6 @@ public class SSQStatus extends L2GameServerPacket
final int dawnProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DAWN);
final int duskProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DUSK);
if (Config.DEBUG)
{
_log.info(SevenSigns.getSealName(i, true) + " = Dawn Prop: " + dawnProportion + "(" + ((dawnProportion / totalDawnMembers) * 100) + "%), Dusk Prop: " + duskProportion + "(" + ((duskProportion / totalDuskMembers) * 100) + "%)");
}
writeC(i);
writeC(SevenSigns.getInstance().getSealOwner(i));

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/MinionList.java
View File

@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.util;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ThreadPoolManager;
@@ -36,8 +35,6 @@ import com.l2jmobius.util.Rnd;
*/
public class MinionList
{
private static final Logger _log = Logger.getLogger(MinionList.class.getName());
protected final L2MonsterInstance _master;
/** List containing the current spawned minions */
private final List<L2MonsterInstance> _minionReferences = new CopyOnWriteArrayList<>();
@@ -348,11 +345,6 @@ public class MinionList
minion.spawnMe(newX, newY, master.getZ());
if (Config.DEBUG)
{
_log.info("Spawned minion template " + minion.getId() + " with objid: " + minion.getObjectId() + " to boss " + master.getObjectId() + " ,at: " + minion.getX() + " x, " + minion.getY() + " y, " + minion.getZ() + " z");
}
return minion;
}

11
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java
View File

@@ -28,7 +28,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler;
import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
@@ -37,7 +36,6 @@ import com.l2jmobius.loginserver.network.loginserverpackets.InitLS;
import com.l2jmobius.loginserver.network.loginserverpackets.KickPlayer;
import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail;
import com.l2jmobius.loginserver.network.loginserverpackets.RequestCharacters;
import com.l2jmobius.util.Util;
import com.l2jmobius.util.crypt.NewCrypt;
import com.l2jmobius.util.network.BaseSendablePacket;
@@ -125,11 +123,6 @@ public class GameServerThread extends Thread
return;
}
if (Config.DEBUG)
{
_log.warning("[C]" + Config.EOL + Util.printData(data));
}
L2JGameServerPacketHandler.handlePacket(data, this);
}
}
@@ -236,10 +229,6 @@ public class GameServerThread extends Thread
{
final byte[] data = sl.getContent();
NewCrypt.appendChecksum(data);
if (Config.DEBUG)
{
_log.finest("[S] " + sl.getClass().getSimpleName() + ":" + Config.EOL + Util.printData(data));
}
_blowfish.crypt(data, 0, data.length);
final int len = data.length + 2;

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginController.java
View File

@@ -221,11 +221,6 @@ public class LoginController
{
if (rset.next())
{
if (Config.DEBUG)
{
_log.fine("Account '" + login + "' exists.");
}
final AccountInfo info = new AccountInfo(rset.getString("login"), rset.getString("password"), rset.getInt("accessLevel"), rset.getInt("lastServer"));
if (!info.checkPassHash(hashBase64))
{

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java
View File

@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.mmocore.MMOClient;
import com.l2jmobius.commons.mmocore.MMOConnection;
import com.l2jmobius.commons.mmocore.SendablePacket;
@@ -263,11 +262,6 @@ public final class L2LoginClient extends MMOClient<MMOConnection<L2LoginClient>>
@Override
public void onDisconnection()
{
if (Config.DEBUG)
{
_log.info("DISCONNECTED: " + toString());
}
if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis()))
{
LoginController.getInstance().removeAuthedLoginClient(getAccount());

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
View File

@@ -22,7 +22,6 @@ import java.util.logging.Logger;
import javax.crypto.Cipher;
import com.l2jmobius.Config;
import com.l2jmobius.loginserver.GameServerThread;
import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
import com.l2jmobius.util.crypt.NewCrypt;
@@ -64,10 +63,6 @@ public class BlowFishKey extends BaseRecievePacket
System.arraycopy(tempDecryptKey, i, key, 0, len - i);
server.SetBlowFish(new NewCrypt(key));
if (Config.DEBUG)
{
_log.info("New BlowFish key received, Blowfih Engine initialized:");
}
server.setLoginConnectionState(GameServerState.BF_CONNECTED);
}
catch (GeneralSecurityException e)

9
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
View File

@@ -78,19 +78,10 @@ public class GameServerAuth extends BaseRecievePacket
_hosts[i] = readS();
}
if (Config.DEBUG)
{
_log.info("Auth request received");
}
if (handleRegProcess())
{
final AuthResponse ar = new AuthResponse(server.getGameServerInfo().getId());
server.sendPacket(ar);
if (Config.DEBUG)
{
_log.info("Authed: id: " + server.getGameServerInfo().getId());
}
server.broadcastToTelnet("GameServer [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId()) + " is connected");
server.setLoginConnectionState(GameServerState.AUTHED);
}

19
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
View File

@@ -16,9 +16,6 @@
*/
package com.l2jmobius.loginserver.network.gameserverpackets;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.loginserver.GameServerThread;
import com.l2jmobius.loginserver.LoginController;
import com.l2jmobius.loginserver.SessionKey;
@@ -30,8 +27,6 @@ import com.l2jmobius.util.network.BaseRecievePacket;
*/
public class PlayerAuthRequest extends BaseRecievePacket
{
private static Logger _log = Logger.getLogger(PlayerAuthRequest.class.getName());
/**
* @param decrypt
* @param server
@@ -47,28 +42,14 @@ public class PlayerAuthRequest extends BaseRecievePacket
final SessionKey sessionKey = new SessionKey(loginKey1, loginKey2, playKey1, playKey2);
PlayerAuthResponse authResponse;
if (Config.DEBUG)
{
_log.info("auth request received for Player " + account);
}
final SessionKey key = LoginController.getInstance().getKeyForAccount(account);
if ((key != null) && key.equals(sessionKey))
{
if (Config.DEBUG)
{
_log.info("auth request: OK");
}
LoginController.getInstance().removeAuthedLoginClient(account);
authResponse = new PlayerAuthResponse(account, true);
}
else
{
if (Config.DEBUG)
{
_log.info("auth request: NO");
_log.info("session key from self: " + key);
_log.info("session key sent: " + sessionKey);
}
authResponse = new PlayerAuthResponse(account, false);
}
server.sendPacket(authResponse);

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
View File

@@ -16,10 +16,6 @@
*/
package com.l2jmobius.loginserver.network.gameserverpackets;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.loginserver.GameServerTable;
import com.l2jmobius.loginserver.GameServerThread;
import com.l2jmobius.util.network.BaseRecievePacket;
@@ -28,8 +24,6 @@ import com.l2jmobius.util.network.BaseRecievePacket;
*/
public class PlayerInGame extends BaseRecievePacket
{
private static Logger _log = Logger.getLogger(PlayerInGame.class.getName());
/**
* @param decrypt
* @param server
@@ -42,10 +36,6 @@ public class PlayerInGame extends BaseRecievePacket
{
final String account = readS();
server.addAccountOnGameServer(account);
if (Config.DEBUG)
{
_log.info("Account " + account + " logged in GameServer: [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId()));
}
server.broadcastToTelnet("Account " + account + " logged in GameServer " + server.getServerId());
}
}

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
View File

@@ -18,8 +18,6 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.loginserver.GameServerTable;
import com.l2jmobius.loginserver.GameServerThread;
import com.l2jmobius.util.network.BaseRecievePacket;
@@ -40,10 +38,6 @@ public class PlayerLogout extends BaseRecievePacket
final String account = readS();
server.removeAccountOnGameServer(account);
if (Config.DEBUG)
{
_log.info("Player " + account + " logged out from gameserver [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId()));
}
server.broadcastToTelnet("Player " + account + " disconnected from GameServer " + server.getServerId());
}

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
View File

@@ -18,7 +18,6 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.loginserver.LoginController;
import com.l2jmobius.util.network.BaseRecievePacket;
@@ -43,9 +42,5 @@ public class PlayerTracert extends BaseRecievePacket
final String hop4 = readS();
LoginController.getInstance().setAccountLastTracert(account, pcIp, hop1, hop2, hop3, hop4);
if (Config.DEBUG)
{
_log.info("Saved " + account + " last tracert");
}
}
}

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java
View File

@@ -18,8 +18,6 @@ package com.l2jmobius.loginserver.network.serverpackets;
import java.util.logging.Logger;
import com.l2jmobius.Config;
/**
* Fromat: d d: response
*/
@@ -33,10 +31,6 @@ public final class GGAuth extends L2LoginServerPacket
public GGAuth(int response)
{
_response = response;
if (Config.DEBUG)
{
_log.warning("Reason Hex: " + Integer.toHexString(response));
}
}
@Override