Removed unnecessary fine logs.
This commit is contained in:
parent
3cc1e5cbfe
commit
9df81f0aa6
@ -679,7 +679,6 @@ public class AdminCommands extends Thread
|
||||
SystemMessage smA = new SystemMessage(614);
|
||||
smA.addString("Added " + expval + " xp and " + spval + " sp to " + player.getName() + ".");
|
||||
activeChar.sendPacket(smA);
|
||||
_log.fine("[GM]" + activeChar.getName() + " added " + expval + " xp and " + spval + " sp to " + player.getName() + ".");
|
||||
showCharacterList(client, _characterToManipulate);
|
||||
}
|
||||
}
|
||||
@ -737,7 +736,6 @@ public class AdminCommands extends Thread
|
||||
SystemMessage smA = new SystemMessage(614);
|
||||
smA.addString("Changed stats of " + player.getName() + ". " + " Hp: " + hpval + " HpMax: " + hpmaxval + " Mp: " + mpval + " MpMax: " + mpmaxval + " MaxLoad: " + loadval + " Karma: " + karmaval + " Pvp: " + pvpflagval + " / " + pvpkillsval + " ClassId: " + classidval);
|
||||
activeChar.sendPacket(smA);
|
||||
_log.fine("[GM]" + activeChar.getName() + " changed stats of " + player.getName() + ". " + " Hp: " + hpval + " HpMax: " + hpmaxval + " Mp: " + mpval + " MpMax: " + mpmaxval + " MaxLoad: " + loadval + " Karma: " + karmaval + " Pvp: " + pvpflagval + " / " + pvpkillsval + " ClassId: " + classidval);
|
||||
showCharacterList(client, _characterToManipulate);
|
||||
}
|
||||
}
|
||||
@ -1047,8 +1045,6 @@ public class AdminCommands extends Thread
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.fine("An administrator resquested server shutdown.");
|
||||
|
||||
try
|
||||
{
|
||||
broadcastToAll("The server will shutdown in " + ((secondsShut - (secondsShut % 60)) / 60) + " minutes and " + (secondsShut % 60) + " seconds.");
|
||||
@ -1094,7 +1090,6 @@ public class AdminCommands extends Thread
|
||||
}
|
||||
if (disconnectAllCharacters() == 1)
|
||||
{
|
||||
_log.fine("All players disconnected, shutting down.");
|
||||
System.exit(0);
|
||||
}
|
||||
else
|
||||
@ -1317,7 +1312,6 @@ public class AdminCommands extends Thread
|
||||
SystemMessage smA = new SystemMessage(614);
|
||||
smA.addString("You gave the skill " + skill.getName() + " to " + player.getName() + ".");
|
||||
activeChar.sendPacket(smA);
|
||||
_log.fine("[GM]" + activeChar.getName() + "gave the skill " + skill.getName() + " to " + player.getName() + ".");
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1342,7 +1336,6 @@ public class AdminCommands extends Thread
|
||||
SystemMessage smA = new SystemMessage(614);
|
||||
smA.addString("You removed the skill " + skill.getName() + " from " + player.getName() + ".");
|
||||
activeChar.sendPacket(smA);
|
||||
_log.fine("[GM]" + activeChar.getName() + "removed the skill " + skill.getName() + " from " + player.getName() + ".");
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1366,18 +1359,15 @@ public class AdminCommands extends Thread
|
||||
activeChar.sendPacket(msk);
|
||||
activeChar.broadcastPacket(msk);
|
||||
// ActionFailed af = new ActionFailed();
|
||||
_log.fine("showing self skill, id: " + skill.getId() + " named: " + skill.getName());
|
||||
}
|
||||
else if (skill.getTargetType() == 1)
|
||||
{
|
||||
// ActionFailed af = new ActionFailed();
|
||||
_log.fine("showing attack skill, id: " + skill.getId() + " named: " + skill.getName());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// else if (skill.getTargetType() == 1)
|
||||
// {
|
||||
// ActionFailed af = new ActionFailed();
|
||||
_log.fine("no such skill id: " + skillid);
|
||||
// }
|
||||
}
|
||||
// else
|
||||
// {
|
||||
// ActionFailed af = new ActionFailed();
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
@ -101,7 +101,6 @@ public class GameServer extends Thread
|
||||
{
|
||||
do
|
||||
{
|
||||
_log.fine("Used mem:" + getUsedMemoryMB() + "MB");
|
||||
// _log.info("Waiting for client connection...");
|
||||
Socket connection = _serverSocket.accept();
|
||||
new ClientThread(connection);
|
||||
@ -138,7 +137,6 @@ public class GameServer extends Thread
|
||||
_log.config("GameServer listening on all available IPs on Port " + Config.SERVER_PORT);
|
||||
}
|
||||
|
||||
_log.finest("Used mem:" + getUsedMemoryMB() + "MB");
|
||||
_log.config("Maximum Numbers of Connected Players: " + Config.MAXIMUM_ONLINE_PLAYERS);
|
||||
new File("data/clans").mkdirs();
|
||||
new File("data/crests").mkdirs();
|
||||
|
@ -17,8 +17,6 @@
|
||||
*/
|
||||
package org.l2jmobius.gameserver;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.model.World;
|
||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.ServerBasePacket;
|
||||
@ -27,7 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SunSet;
|
||||
|
||||
public class GameTimeController extends Thread
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(GameTimeController.class.getName());
|
||||
private static GameTimeController _instance;
|
||||
private long _gameStartTime = System.currentTimeMillis() - 3600000L;
|
||||
|
||||
@ -60,11 +57,9 @@ public class GameTimeController extends Thread
|
||||
do
|
||||
{
|
||||
broadcastToPlayers(new SunRise());
|
||||
_log.fine("SunRise");
|
||||
Thread.sleep(21600000L);
|
||||
_gameStartTime = System.currentTimeMillis();
|
||||
broadcastToPlayers(new SunSet());
|
||||
_log.fine("SunSet");
|
||||
Thread.sleep(3600000L);
|
||||
}
|
||||
while (true);
|
||||
|
@ -21,11 +21,9 @@ import java.io.File;
|
||||
import java.io.FilenameFilter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class CharNameTable
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(CharNameTable.class.getName());
|
||||
private static CharNameTable _instance;
|
||||
private final List<String> _charNames;
|
||||
|
||||
@ -61,18 +59,15 @@ public class CharNameTable
|
||||
// empty catch block
|
||||
}
|
||||
}
|
||||
_log.fine("Loaded " + _charNames.size() + " charnames to the memory.");
|
||||
}
|
||||
|
||||
public void addCharName(String name)
|
||||
{
|
||||
_log.fine("Added charname: " + name + " to the memory.");
|
||||
_charNames.add(name.toLowerCase());
|
||||
}
|
||||
|
||||
public void deleteCharName(String name)
|
||||
{
|
||||
_log.fine("Deleted charname: " + name + " from the memory.");
|
||||
_charNames.remove(name.toLowerCase());
|
||||
}
|
||||
|
||||
|
@ -145,7 +145,6 @@ public class ClanTable
|
||||
clan.setHasHideout(0);
|
||||
clan.setAllyId(0);
|
||||
clan.setAllyName(" ");
|
||||
_log.fine("New clan created: " + clan.getClanId());
|
||||
ClanMember leader = new ClanMember(player.getName(), player.getLevel(), player.getClassId(), player.getObjectId());
|
||||
clan.setLeader(leader);
|
||||
_clans.put(clan.getClanId(), clan);
|
||||
|
@ -466,7 +466,6 @@ public class ItemTable
|
||||
}
|
||||
highestId = id;
|
||||
}
|
||||
_log.fine("Highest item id used: " + highestId);
|
||||
|
||||
// Create a FastLookUp Table called _allTemplates of size : value of the highest item ID
|
||||
_allTemplates = new Item[highestId + 1];
|
||||
@ -500,7 +499,6 @@ public class ItemTable
|
||||
ItemInstance temp = new ItemInstance();
|
||||
temp.setObjectId(IdFactory.getInstance().getNextId());
|
||||
temp.setItem(getTemplate(itemId));
|
||||
_log.fine("Item created oid: " + temp.getObjectId() + " itemid: " + itemId);
|
||||
World.getInstance().storeObject(temp);
|
||||
return temp;
|
||||
}
|
||||
|
@ -22,14 +22,11 @@ import java.io.FileInputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.LineNumberReader;
|
||||
import java.util.StringTokenizer;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||
|
||||
public class MapRegionTable
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(MapRegionTable.class.getName());
|
||||
|
||||
private static int[][] _regions = new int[19][21];
|
||||
private static MapRegionTable _instance;
|
||||
|
||||
@ -46,7 +43,6 @@ public class MapRegionTable
|
||||
{
|
||||
super();
|
||||
int count = 0;
|
||||
int count2 = 0;
|
||||
try
|
||||
{
|
||||
File regionDataFile = new File("data/mapregion.csv");
|
||||
@ -59,18 +55,16 @@ public class MapRegionTable
|
||||
continue;
|
||||
}
|
||||
StringTokenizer st = new StringTokenizer(line, ";");
|
||||
for (int j = 0; j < 10; ++count2, ++j)
|
||||
for (int j = 0; j < 10; ++j)
|
||||
{
|
||||
MapRegionTable._regions[j][count] = Integer.parseInt(st.nextToken());
|
||||
}
|
||||
++count;
|
||||
}
|
||||
_log.fine("Loaded " + count2 + " map regions.");
|
||||
lnr.close();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_log.fine("Error loading map regions. " + e);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -35,7 +35,6 @@ public class SpawnTable
|
||||
private static Logger _log = Logger.getLogger(SpawnTable.class.getName());
|
||||
private static SpawnTable _instance;
|
||||
private final Map<Integer, Spawn> _spawntable = new HashMap<>();
|
||||
private int _npcSpawnCount;
|
||||
private int _highestId;
|
||||
|
||||
public static SpawnTable getInstance()
|
||||
@ -77,7 +76,6 @@ public class SpawnTable
|
||||
}
|
||||
lnr.close();
|
||||
_log.config("Created " + _spawntable.size() + " spawn handlers.");
|
||||
_log.fine("Spawning completed, total number of NPCs in the world: " + _npcSpawnCount);
|
||||
}
|
||||
catch (FileNotFoundException e)
|
||||
{
|
||||
@ -113,7 +111,7 @@ public class SpawnTable
|
||||
spawnDat.setRandomy(Integer.parseInt(st.nextToken()));
|
||||
spawnDat.setHeading(Integer.parseInt(st.nextToken()));
|
||||
spawnDat.setRespawnDelay(Integer.parseInt(st.nextToken()));
|
||||
_npcSpawnCount += spawnDat.init();
|
||||
spawnDat.init();
|
||||
return spawnDat;
|
||||
}
|
||||
|
||||
|
@ -48,7 +48,6 @@ public class TradeController
|
||||
private TradeController()
|
||||
{
|
||||
String line = null;
|
||||
int dummyItemCount = 0;
|
||||
try
|
||||
{
|
||||
File buylistData = new File("data/buylists.csv");
|
||||
@ -59,10 +58,9 @@ public class TradeController
|
||||
{
|
||||
continue;
|
||||
}
|
||||
dummyItemCount += parseList(line);
|
||||
parseList(line);
|
||||
}
|
||||
lnr.close();
|
||||
_log.fine("Created " + dummyItemCount + " Dummy-Items for buylists.");
|
||||
_log.config("Loaded " + _lists.size() + " buylists.");
|
||||
}
|
||||
catch (FileNotFoundException e)
|
||||
@ -75,9 +73,8 @@ public class TradeController
|
||||
}
|
||||
}
|
||||
|
||||
private int parseList(String line)
|
||||
private void parseList(String line)
|
||||
{
|
||||
int itemCreated = 0;
|
||||
StringTokenizer st = new StringTokenizer(line, ";");
|
||||
int listId = Integer.parseInt(st.nextToken());
|
||||
TradeList buy1 = new TradeList(listId);
|
||||
@ -88,10 +85,8 @@ public class TradeController
|
||||
ItemInstance item = ItemTable.getInstance().createDummyItem(itemId);
|
||||
item.setPrice(price);
|
||||
buy1.addItem(item);
|
||||
++itemCreated;
|
||||
}
|
||||
_lists.put(buy1.getListId(), buy1);
|
||||
return itemCreated;
|
||||
}
|
||||
|
||||
public TradeList getBuyList(int listId)
|
||||
|
@ -17,8 +17,6 @@
|
||||
*/
|
||||
package org.l2jmobius.gameserver.handler.itemhandlers;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.IdFactory;
|
||||
import org.l2jmobius.gameserver.data.ExperienceTable;
|
||||
import org.l2jmobius.gameserver.data.NpcTable;
|
||||
@ -36,7 +34,6 @@ import org.l2jmobius.gameserver.templates.Npc;
|
||||
|
||||
public class PetSummon implements IItemHandler
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(PetSummon.class.getName());
|
||||
private static int[] _itemIds = new int[]
|
||||
{
|
||||
2375,
|
||||
@ -51,7 +48,6 @@ public class PetSummon implements IItemHandler
|
||||
int npcId;
|
||||
if (activeChar.getPet() != null)
|
||||
{
|
||||
_log.fine("player has a pet already. ignore use item");
|
||||
return 0;
|
||||
}
|
||||
switch (item.getItemId())
|
||||
|
@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.managers;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.ServerBasePacket;
|
||||
@ -27,7 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||
|
||||
public class GmListManager
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(GmListManager.class.getName());
|
||||
private static GmListManager _instance;
|
||||
private final List<PlayerInstance> _gmList = new ArrayList<>();
|
||||
|
||||
@ -46,13 +44,11 @@ public class GmListManager
|
||||
|
||||
public void addGm(PlayerInstance player)
|
||||
{
|
||||
_log.fine("added gm: " + player.getName());
|
||||
_gmList.add(player);
|
||||
}
|
||||
|
||||
public void deleteGm(PlayerInstance player)
|
||||
{
|
||||
_log.fine("deleted gm: " + player.getName());
|
||||
_gmList.remove(player);
|
||||
}
|
||||
|
||||
|
@ -134,7 +134,6 @@ public class Inventory
|
||||
public Collection<ItemInstance> unEquipItemInBodySlot(int slot)
|
||||
{
|
||||
List<ItemInstance> unequipedItems = new ArrayList<>();
|
||||
// _log.fine("--- unequip body slot:" + slot);
|
||||
int pdollSlot = -1;
|
||||
switch (slot)
|
||||
{
|
||||
@ -393,7 +392,6 @@ public class Inventory
|
||||
|
||||
private ItemInstance unEquipSlot(int slot)
|
||||
{
|
||||
_log.fine("--- unEquipSlot: " + slot);
|
||||
ItemInstance item = _paperdoll[slot];
|
||||
if (item != null)
|
||||
{
|
||||
@ -545,13 +543,11 @@ public class Inventory
|
||||
}
|
||||
if (oldItem.getCount() == count)
|
||||
{
|
||||
_log.fine(" count = count --> remove");
|
||||
_items.remove(oldItem);
|
||||
oldItem.setLastChange(3);
|
||||
refreshWeight();
|
||||
return oldItem;
|
||||
}
|
||||
_log.fine(" count != count --> reduce");
|
||||
oldItem.setCount(oldItem.getCount() - count);
|
||||
oldItem.setLastChange(2);
|
||||
ItemInstance newItem = ItemTable.getInstance().createItem(oldItem.getItemId());
|
||||
|
@ -52,7 +52,6 @@ public class Potion extends WorldObject
|
||||
_potionhpRegTask = new PotionHpHealing(activeChar);
|
||||
_regenTimer.schedule(_potionhpRegTask, 1000L, _seconds);
|
||||
// this._potionhpRegenActive = true;
|
||||
// _log.fine("Potion HP regen Started");
|
||||
}
|
||||
|
||||
public void stopPotionHpRegeneration()
|
||||
@ -63,7 +62,6 @@ public class Potion extends WorldObject
|
||||
}
|
||||
_potionhpRegTask = null;
|
||||
// this._potionhpRegenActive = false;
|
||||
// _log.fine("Potion HP regen stop");
|
||||
}
|
||||
|
||||
public void setCurrentHpPotion2(Creature activeChar)
|
||||
@ -154,7 +152,6 @@ public class Potion extends WorldObject
|
||||
_potionmpRegTask = new PotionMpHealing(activeChar);
|
||||
_regenTimer.schedule(_potionmpRegTask, 1000L, _seconds);
|
||||
// this._potionmpRegenActive = true;
|
||||
// _log.fine("Potion MP regen Started");
|
||||
}
|
||||
|
||||
public void stopPotionMpRegeneration()
|
||||
@ -165,7 +162,6 @@ public class Potion extends WorldObject
|
||||
}
|
||||
_potionmpRegTask = null;
|
||||
// this._potionmpRegenActive = false;
|
||||
// _log.fine("Potion MP regen stop");
|
||||
}
|
||||
|
||||
public void setCurrentMpPotion2(Creature activeChar)
|
||||
|
@ -166,13 +166,12 @@ public class Spawn
|
||||
}
|
||||
}
|
||||
|
||||
public int init()
|
||||
public void init()
|
||||
{
|
||||
while (_currentCount < _maximumCount)
|
||||
{
|
||||
doSpawn();
|
||||
}
|
||||
return _currentCount;
|
||||
}
|
||||
|
||||
public void doSpawn()
|
||||
@ -244,7 +243,6 @@ public class Spawn
|
||||
mob.setSpawn(this);
|
||||
World.getInstance().storeObject(mob);
|
||||
World.getInstance().addVisibleObject(mob);
|
||||
_log.finest("spawned Mob ID: " + _template.getNpcId() + " ,at: " + mob.getX() + " x, " + mob.getY() + " y, " + mob.getZ() + " z");
|
||||
++_currentCount;
|
||||
}
|
||||
catch (Exception e)
|
||||
|
@ -19,13 +19,11 @@ package org.l2jmobius.gameserver.model;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.model.actor.instance.ItemInstance;
|
||||
|
||||
public class Warehouse
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(Warehouse.class.getName());
|
||||
private final List<ItemInstance> _items = new ArrayList<>();
|
||||
|
||||
public int getSize()
|
||||
@ -103,10 +101,6 @@ public class Warehouse
|
||||
item.setLastChange(2);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.fine("can't destroy " + count + " item(s) " + itemId);
|
||||
}
|
||||
return item;
|
||||
}
|
||||
}
|
||||
|
@ -93,15 +93,10 @@ public class Attackable extends NpcInstance
|
||||
{
|
||||
if (_active)
|
||||
{
|
||||
_log.fine(getObjectId() + ": target reached ! new target calculated.");
|
||||
int wait = (10 + Rnd.get(120)) * 1000;
|
||||
_currentAiTask = new AITask(this);
|
||||
_aiTimer.schedule(_currentAiTask, wait);
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.fine(getObjectId() + ": target reached ! noone around .. cancel movement.");
|
||||
}
|
||||
}
|
||||
|
||||
protected void startRandomWalking()
|
||||
@ -168,10 +163,6 @@ public class Attackable extends NpcInstance
|
||||
stopRandomWalking();
|
||||
startAttack(attacker);
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.fine("already attacking");
|
||||
}
|
||||
}
|
||||
else if (isDead())
|
||||
{
|
||||
@ -309,7 +300,6 @@ public class Attackable extends NpcInstance
|
||||
if (itemCount != 0)
|
||||
{
|
||||
dropit.setCount(itemCount);
|
||||
_log.fine("Item id to drop: " + drop.getItemId() + " amount: " + dropit.getCount());
|
||||
dropit.setX(getX());
|
||||
dropit.setY(getY());
|
||||
dropit.setZ(getZ() + 100);
|
||||
@ -322,7 +312,6 @@ public class Attackable extends NpcInstance
|
||||
World.getInstance().addVisibleObject(dropit);
|
||||
continue;
|
||||
}
|
||||
_log.finer("Roll produced 0 items to drop... Cancelling.");
|
||||
}
|
||||
}
|
||||
|
||||
@ -427,14 +416,12 @@ public class Attackable extends NpcInstance
|
||||
{
|
||||
if (!isInCombat())
|
||||
{
|
||||
_log.finer(getObjectId() + ": monster knows " + getKnownPlayers().size() + " players");
|
||||
for (PlayerInstance player : getKnownPlayers())
|
||||
{
|
||||
if (!getCondition2(player) || !(getDistance(player.getX(), player.getY()) <= (getCollisionRadius() + 200.0)))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
_log.fine(getObjectId() + ": Player " + player.getObjectId() + " in aggro range. Attacking!");
|
||||
if (_currentAiTask != null)
|
||||
{
|
||||
_currentAiTask.cancel();
|
||||
|
@ -352,13 +352,11 @@ public abstract class Creature extends WorldObject
|
||||
_hpRegTask.cancel();
|
||||
_hpRegTask = null;
|
||||
_hpRegenActive = false;
|
||||
_log.fine("HP regen stop");
|
||||
}
|
||||
}
|
||||
|
||||
private void startHpRegeneration()
|
||||
{
|
||||
_log.fine("HP regen started");
|
||||
_hpRegTask = new HpRegenTask(this);
|
||||
_regenTimer.scheduleAtFixedRate(_hpRegTask, 3000L, 3000L);
|
||||
_hpRegenActive = true;
|
||||
@ -387,7 +385,6 @@ public abstract class Creature extends WorldObject
|
||||
private void startMpRegeneration()
|
||||
{
|
||||
_mpRegTask = new MpRegenTask(this);
|
||||
_log.fine("MP regen started");
|
||||
_regenTimer.scheduleAtFixedRate(_mpRegTask, 3000L, 3000L);
|
||||
_mpRegenActive = true;
|
||||
}
|
||||
@ -398,7 +395,6 @@ public abstract class Creature extends WorldObject
|
||||
{
|
||||
_mpRegTask.cancel();
|
||||
_mpRegTask = null;
|
||||
_log.fine("Mp regen stopped");
|
||||
_mpRegenActive = false;
|
||||
}
|
||||
}
|
||||
@ -520,7 +516,6 @@ public abstract class Creature extends WorldObject
|
||||
|
||||
public void increaseLevel()
|
||||
{
|
||||
_log.finest("increasing level of " + getName());
|
||||
++_level;
|
||||
StatusUpdate su = new StatusUpdate(getObjectId());
|
||||
su.addAttribute(StatusUpdate.LEVEL, _level);
|
||||
@ -533,7 +528,6 @@ public abstract class Creature extends WorldObject
|
||||
|
||||
public void decreaseLevel()
|
||||
{
|
||||
_log.finest("increasing level of " + getName());
|
||||
--_level;
|
||||
StatusUpdate su = new StatusUpdate(getObjectId());
|
||||
su.addAttribute(StatusUpdate.LEVEL, _level);
|
||||
@ -814,7 +808,6 @@ public abstract class Creature extends WorldObject
|
||||
_currentHp -= i;
|
||||
if (_currentHp <= 0.0)
|
||||
{
|
||||
_log.fine("char is dead.");
|
||||
_currentHp = 0.0;
|
||||
stopHpRegeneration();
|
||||
stopMpRegeneration();
|
||||
@ -859,7 +852,6 @@ public abstract class Creature extends WorldObject
|
||||
{
|
||||
if (offset == 0)
|
||||
{
|
||||
_log.fine("moveToLoc: x:" + x + " y:" + y + " from x:" + getX() + " y:" + getY() + " z:" + getZ());
|
||||
if (isMovingToPawn())
|
||||
{
|
||||
setMovingToPawn(false);
|
||||
@ -884,7 +876,6 @@ public abstract class Creature extends WorldObject
|
||||
}
|
||||
if ((getPawnTarget() == null) || (getPawnTarget() != getTarget()))
|
||||
{
|
||||
_log.fine("moveToPawn: x:" + x + " y:" + y + " from x:" + getX() + " y:" + getY() + " z:" + getZ());
|
||||
setMovingToPawn(true);
|
||||
setPawnTarget((Creature) getTarget());
|
||||
setPawnOffset(offset);
|
||||
@ -909,7 +900,6 @@ public abstract class Creature extends WorldObject
|
||||
{
|
||||
if (isMoving())
|
||||
{
|
||||
_log.fine(getName() + " ::current movement interrupted .. setting new target");
|
||||
stopMove();
|
||||
}
|
||||
if ((getPawnTarget() != null) && (distance <= getAttackRange()) && (getCurrentState() == 8))
|
||||
@ -919,7 +909,6 @@ public abstract class Creature extends WorldObject
|
||||
_currentMoveTask = newMoveTask;
|
||||
return;
|
||||
}
|
||||
_log.fine("distance to target:" + distance);
|
||||
int dx = x - getX();
|
||||
int dy = y - getY();
|
||||
if (_moveOffset > 0)
|
||||
@ -927,7 +916,6 @@ public abstract class Creature extends WorldObject
|
||||
if ((distance - _moveOffset) <= 0.0)
|
||||
{
|
||||
distance = 0.0;
|
||||
_log.fine("already in range, no movement needed.");
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -950,7 +938,6 @@ public abstract class Creature extends WorldObject
|
||||
_yAddition = ((dy / distance) * speed) / 1000.0;
|
||||
int heading = (int) (Math.atan2(-dy, -dx) * 10430.378350470453);
|
||||
setHeading(heading += 32768);
|
||||
_log.fine("dist:" + distance + "speed:" + speed + " ttt:" + _timeToTarget + " dx:" + _xAddition + " dy:" + _yAddition + " heading:" + heading);
|
||||
int destinationX = getX() + (int) (_xAddition * _timeToTarget);
|
||||
int destinationY = getY() + (int) (_yAddition * _timeToTarget);
|
||||
setXdestination(destinationX);
|
||||
@ -961,7 +948,6 @@ public abstract class Creature extends WorldObject
|
||||
{
|
||||
_timeToTarget = 0L;
|
||||
}
|
||||
_log.fine("time to target:" + _timeToTarget);
|
||||
ArriveTask newMoveTask = new ArriveTask(this);
|
||||
if (getPawnTarget() != null)
|
||||
{
|
||||
@ -1059,7 +1045,6 @@ public abstract class Creature extends WorldObject
|
||||
}
|
||||
}
|
||||
stopMove();
|
||||
_log.fine(getName() + ":: target reached at: x " + getX() + " y " + getY() + " z:" + getZ());
|
||||
if (getPawnTarget() != null)
|
||||
{
|
||||
setPawnTarget(null);
|
||||
@ -1103,14 +1088,13 @@ public abstract class Creature extends WorldObject
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.warning("multiple attacks want to start in parallel. prevented.");
|
||||
_log.warning("Multiple attacks want to start in parallel. Prevented.");
|
||||
}
|
||||
}
|
||||
|
||||
private void onAttackTimer()
|
||||
{
|
||||
_currentAttackTask = null;
|
||||
_log.fine("onAttack: state=" + getCurrentState() + " target=" + _attackTarget.getObjectId());
|
||||
Creature target = (Creature) _attackTarget;
|
||||
if (isDead() || (target == null) || target.isDead() || ((getCurrentState() != 5) && (getCurrentState() != 2)) || !target.knownsObject(this) || !knownsObject(target))
|
||||
{
|
||||
@ -1317,7 +1301,6 @@ public abstract class Creature extends WorldObject
|
||||
{
|
||||
if (target == null)
|
||||
{
|
||||
_log.fine("no target ??");
|
||||
setInCombat(false);
|
||||
setCurrentState((byte) 0);
|
||||
ActionFailed af = new ActionFailed();
|
||||
|
@ -17,8 +17,6 @@
|
||||
*/
|
||||
package org.l2jmobius.gameserver.model.actor.instance;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.CharInfo;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected;
|
||||
@ -29,8 +27,6 @@ import org.l2jmobius.gameserver.templates.Npc;
|
||||
|
||||
public class ClassMasterInstance extends NpcInstance
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(ClassMasterInstance.class.getName());
|
||||
|
||||
public ClassMasterInstance(Npc template)
|
||||
{
|
||||
super(template);
|
||||
@ -42,7 +38,6 @@ public class ClassMasterInstance extends NpcInstance
|
||||
if (getObjectId() != player.getTargetId())
|
||||
{
|
||||
player.setCurrentState((byte) 0);
|
||||
_log.fine("ClassMaster selected:" + getObjectId());
|
||||
player.setTarget(this);
|
||||
MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
|
||||
player.sendPacket(my);
|
||||
@ -50,7 +45,6 @@ public class ClassMasterInstance extends NpcInstance
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.fine("ClassMaster activated");
|
||||
int classId = player.getClassId();
|
||||
int jobLevel = 0;
|
||||
int level = player.getLevel();
|
||||
@ -148,11 +142,7 @@ public class ClassMasterInstance extends NpcInstance
|
||||
|
||||
private void changeClass(PlayerInstance player, int val)
|
||||
{
|
||||
// _log.fine("Changing class to ClassId:" + val);
|
||||
player.setClassId(val);
|
||||
// _log.fine("name:" + player.getName());
|
||||
// _log.fine("level:" + player.getLevel());
|
||||
// _log.fine("classId:" + player.getClassId());
|
||||
UserInfo ui = new UserInfo(player);
|
||||
player.sendPacket(ui);
|
||||
CharInfo info = new CharInfo(player);
|
||||
|
@ -17,13 +17,10 @@
|
||||
*/
|
||||
package org.l2jmobius.gameserver.model.actor.instance;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.model.WorldObject;
|
||||
|
||||
public class DoorInstance extends WorldObject
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(DoorInstance.class.getName());
|
||||
private int _damage;
|
||||
private int _open;
|
||||
private int _enemy;
|
||||
@ -32,7 +29,7 @@ public class DoorInstance extends WorldObject
|
||||
@Override
|
||||
public void onAction(PlayerInstance player)
|
||||
{
|
||||
_log.fine("Door activated");
|
||||
// _log.fine("Door activated");
|
||||
}
|
||||
|
||||
public int getDamage()
|
||||
|
@ -17,8 +17,6 @@
|
||||
*/
|
||||
package org.l2jmobius.gameserver.model.actor.instance;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.model.WorldObject;
|
||||
import org.l2jmobius.gameserver.model.actor.Attackable;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||
@ -28,7 +26,6 @@ import org.l2jmobius.gameserver.templates.Npc;
|
||||
|
||||
public class GuardInstance extends Attackable
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(GuardInstance.class.getName());
|
||||
private static final int INTERACTION_DISTANCE = 150;
|
||||
private int _homeX;
|
||||
private int _homeY;
|
||||
@ -44,15 +41,13 @@ public class GuardInstance extends Attackable
|
||||
@Override
|
||||
public void addKnownObject(WorldObject object)
|
||||
{
|
||||
PlayerInstance player;
|
||||
if (!_hasHome)
|
||||
{
|
||||
getHomeLocation();
|
||||
}
|
||||
super.addKnownObject(object);
|
||||
if ((object instanceof PlayerInstance) && ((player = (PlayerInstance) object).getKarma() > 0) && !isTargetScanActive())
|
||||
if ((object instanceof PlayerInstance) && (((PlayerInstance) object).getKarma() > 0) && !isTargetScanActive())
|
||||
{
|
||||
_log.fine(getObjectId() + ": PK " + player.getObjectId() + " entered scan range");
|
||||
startTargetScan();
|
||||
}
|
||||
}
|
||||
@ -80,12 +75,10 @@ public class GuardInstance extends Attackable
|
||||
_homeX = getX();
|
||||
_homeY = getY();
|
||||
_homeZ = getZ();
|
||||
_log.finer(getObjectId() + ": Home location set to X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ);
|
||||
}
|
||||
|
||||
private void returnHome()
|
||||
{
|
||||
_log.fine(getObjectId() + ": moving home");
|
||||
clearAggroList();
|
||||
moveTo(_homeX, _homeY, _homeZ, 0);
|
||||
}
|
||||
@ -110,7 +103,6 @@ public class GuardInstance extends Attackable
|
||||
if (getObjectId() != player.getTargetId())
|
||||
{
|
||||
player.setCurrentState((byte) 0);
|
||||
_log.fine(player.getObjectId() + ": Targetted guard " + getObjectId());
|
||||
player.setTarget(this);
|
||||
MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
|
||||
player.sendPacket(my);
|
||||
@ -118,7 +110,6 @@ public class GuardInstance extends Attackable
|
||||
}
|
||||
else if (containsTarget(player))
|
||||
{
|
||||
_log.fine(player.getObjectId() + ": Attacked guard " + getObjectId());
|
||||
player.startAttack(this);
|
||||
}
|
||||
else
|
||||
|
@ -38,7 +38,6 @@ public class MerchantInstance extends NpcInstance
|
||||
@Override
|
||||
public void onAction(PlayerInstance player)
|
||||
{
|
||||
// _log.fine("Merchant activated");
|
||||
super.onAction(player);
|
||||
}
|
||||
|
||||
@ -52,7 +51,6 @@ public class MerchantInstance extends NpcInstance
|
||||
|
||||
private void showBuyWindow(PlayerInstance player, int val)
|
||||
{
|
||||
_log.fine("Showing buylist");
|
||||
TradeList list = TradeController.getInstance().getBuyList(val);
|
||||
if (list != null)
|
||||
{
|
||||
@ -68,10 +66,8 @@ public class MerchantInstance extends NpcInstance
|
||||
|
||||
private void showSellWindow(PlayerInstance player)
|
||||
{
|
||||
// _log.fine("Showing selllist");
|
||||
SellList sl = new SellList(player);
|
||||
player.sendPacket(sl);
|
||||
// _log.fine("Showing sell window");
|
||||
player.sendPacket(new ActionFailed());
|
||||
}
|
||||
|
||||
|
@ -126,7 +126,6 @@ public class NpcInstance extends Creature
|
||||
player.cancelCastMagic();
|
||||
}
|
||||
player.setCurrentState((byte) 0);
|
||||
_log.fine("new target selected:" + getObjectId());
|
||||
player.setTarget(this);
|
||||
MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
|
||||
player.sendPacket(my);
|
||||
@ -227,7 +226,6 @@ public class NpcInstance extends Creature
|
||||
|
||||
protected void showQuestWindow(PlayerInstance player, int val)
|
||||
{
|
||||
_log.fine("Showing quest window");
|
||||
NpcHtmlMessage html = new NpcHtmlMessage(1);
|
||||
html.setHtml("<html><head><body>There is no quests here yet.</body></html>");
|
||||
player.sendPacket(html);
|
||||
|
@ -89,7 +89,6 @@ public class PetInstance extends Creature
|
||||
player.sendPacket(new ActionFailed());
|
||||
}
|
||||
player.setCurrentState((byte) 0);
|
||||
_log.fine("new target selected:" + getObjectId());
|
||||
player.setTarget(this);
|
||||
MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
|
||||
player.sendPacket(my);
|
||||
@ -256,7 +255,6 @@ public class PetInstance extends Creature
|
||||
@Override
|
||||
public void addExpAndSp(int addToExp, int addToSp)
|
||||
{
|
||||
_log.fine("adding " + addToExp + " exp and " + addToSp + " sp to " + getName());
|
||||
_exp += addToExp;
|
||||
_sp += addToSp;
|
||||
PetStatusUpdate su = new PetStatusUpdate(this);
|
||||
@ -270,7 +268,6 @@ public class PetInstance extends Creature
|
||||
@Override
|
||||
public void increaseLevel()
|
||||
{
|
||||
_log.finest("Increasing level of " + getName());
|
||||
setLastLevel(getNextLevel());
|
||||
setLevel(getLevel() + 1);
|
||||
setNextLevel(ExperienceTable.getInstance().getExp(getLevel() + 1));
|
||||
@ -346,7 +343,6 @@ public class PetInstance extends Creature
|
||||
private void doPickupItem()
|
||||
{
|
||||
StopMove sm = new StopMove(getObjectId(), getX(), getY(), getZ(), getHeading());
|
||||
_log.fine("Pet pickup pos: " + getTarget().getX() + " " + getTarget().getY() + " " + getTarget().getZ());
|
||||
broadcastPacket(sm);
|
||||
if (!(getTarget() instanceof ItemInstance))
|
||||
{
|
||||
@ -396,10 +392,10 @@ public class PetInstance extends Creature
|
||||
{
|
||||
startAttack(attacker);
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.fine("already attacking");
|
||||
}
|
||||
// else
|
||||
// {
|
||||
// _log.fine("already attacking");
|
||||
// }
|
||||
}
|
||||
if (isDead())
|
||||
{
|
||||
@ -438,7 +434,7 @@ public class PetInstance extends Creature
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_log.fine("Give all items error " + e);
|
||||
_log.warning("Give all items error " + e);
|
||||
}
|
||||
}
|
||||
|
||||
@ -456,7 +452,7 @@ public class PetInstance extends Creature
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_log.fine("Error while giving item to owner: " + e);
|
||||
_log.warning("Error while giving item to owner: " + e);
|
||||
}
|
||||
}
|
||||
|
||||
@ -506,7 +502,7 @@ public class PetInstance extends Creature
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_log.fine("Error while destroying control item: " + e);
|
||||
_log.warning("Error while destroying control item: " + e);
|
||||
}
|
||||
}
|
||||
|
||||
@ -521,7 +517,7 @@ public class PetInstance extends Creature
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_log.fine("Pet Drop Error: " + e);
|
||||
_log.warning("Pet Drop Error: " + e);
|
||||
}
|
||||
}
|
||||
|
||||
@ -530,7 +526,6 @@ public class PetInstance extends Creature
|
||||
dropit = getInventory().dropItem(dropit.getObjectId(), dropit.getCount());
|
||||
if (dropit != null)
|
||||
{
|
||||
_log.fine("Item id to drop: " + dropit.getItemId() + " amount: " + dropit.getCount());
|
||||
dropit.setX(getX());
|
||||
dropit.setY(getY());
|
||||
dropit.setZ(getZ() + 100);
|
||||
|
@ -336,7 +336,6 @@ public class PlayerInstance extends Creature
|
||||
@Override
|
||||
public void addExpAndSp(int addToExp, int addToSp)
|
||||
{
|
||||
_log.fine("adding " + addToExp + " exp and " + addToSp + " sp to " + getName());
|
||||
_exp += addToExp;
|
||||
_sp += addToSp;
|
||||
StatusUpdate su = new StatusUpdate(getObjectId());
|
||||
@ -367,29 +366,21 @@ public class PlayerInstance extends Creature
|
||||
{
|
||||
Skill skill = SkillTable.getInstance().getInfo(194, 1);
|
||||
removeSkill(skill);
|
||||
_log.fine("removed skill 'Lucky' from " + getName());
|
||||
}
|
||||
else if (lvl == 20)
|
||||
{
|
||||
Skill skill = SkillTable.getInstance().getInfo(239, 1);
|
||||
addSkill(skill);
|
||||
_log.fine("awarded " + getName() + " with expertise D.");
|
||||
}
|
||||
else if (lvl == 40)
|
||||
{
|
||||
Skill skill = SkillTable.getInstance().getInfo(239, 2);
|
||||
addSkill(skill);
|
||||
_log.fine("awarded " + getName() + " with expertise C.");
|
||||
}
|
||||
else if (lvl == 52)
|
||||
{
|
||||
Skill skill = SkillTable.getInstance().getInfo(239, 3);
|
||||
addSkill(skill);
|
||||
_log.fine("awarded " + getName() + " with expertise B.");
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.fine("No skills awarded at lvl: " + lvl);
|
||||
}
|
||||
}
|
||||
|
||||
@ -610,7 +601,6 @@ public class PlayerInstance extends Creature
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.fine("starting combat");
|
||||
super.startCombat();
|
||||
}
|
||||
}
|
||||
@ -679,7 +669,6 @@ public class PlayerInstance extends Creature
|
||||
ItemInstance target = (ItemInstance) getTarget();
|
||||
sendPacket(new ActionFailed());
|
||||
StopMove sm = new StopMove(getObjectId(), getX(), getY(), getZ(), getHeading());
|
||||
_log.fine("pickup pos: " + target.getX() + " " + target.getY() + " " + target.getZ());
|
||||
sendPacket(sm);
|
||||
boolean pickupOk = false;
|
||||
ItemInstance ItemInstance = target;
|
||||
@ -794,11 +783,9 @@ public class PlayerInstance extends Creature
|
||||
if (attacker != null)
|
||||
{
|
||||
SystemMessage smsg = new SystemMessage(36);
|
||||
_log.fine("Attacker:" + attacker.getName());
|
||||
if ((attacker instanceof MonsterInstance) || (attacker instanceof NpcInstance))
|
||||
{
|
||||
int mobId = ((NpcInstance) attacker).getNpcTemplate().getNpcId();
|
||||
_log.fine("mob id:" + mobId);
|
||||
smsg.addNpcName(mobId);
|
||||
}
|
||||
else
|
||||
@ -906,13 +893,11 @@ public class PlayerInstance extends Creature
|
||||
Creature obj = (Creature) object;
|
||||
if (obj.isMoving())
|
||||
{
|
||||
_log.fine("Spotted object in movement, updating status");
|
||||
CharMoveToLocation mov = new CharMoveToLocation(obj);
|
||||
sendPacket(mov);
|
||||
}
|
||||
else if (obj.isMovingToPawn())
|
||||
{
|
||||
_log.fine("Spotted object in movement to pawn, updating status");
|
||||
MoveToPawn mov = new MoveToPawn(obj, obj.getPawnTarget(), obj.getPawnOffset());
|
||||
sendPacket(mov);
|
||||
}
|
||||
@ -1051,7 +1036,6 @@ public class PlayerInstance extends Creature
|
||||
}
|
||||
double pAtk = weapondmg * lvlmod * strmod;
|
||||
setPhysicalAttack((int) Math.rint(pAtk));
|
||||
_log.fine("new patk: " + pAtk + " weapon patk: " + weapondmg);
|
||||
}
|
||||
|
||||
public void updatePDef()
|
||||
@ -1106,7 +1090,6 @@ public class PlayerInstance extends Creature
|
||||
}
|
||||
double pDef = totalItemDef * lvlmod;
|
||||
setPhysicalDefense((int) Math.round(pDef));
|
||||
_log.fine(getObjectId() + ": new pdef: " + pDef);
|
||||
}
|
||||
|
||||
public void updateMAtk()
|
||||
@ -1141,7 +1124,6 @@ public class PlayerInstance extends Creature
|
||||
}
|
||||
double mAtk = weapondmg * lvlmod * intmod;
|
||||
setMagicalAttack((int) Math.rint(mAtk));
|
||||
_log.fine("new matk: " + mAtk + " weapon matk: " + weapondmg);
|
||||
}
|
||||
|
||||
public void updateMDef()
|
||||
@ -1196,7 +1178,6 @@ public class PlayerInstance extends Creature
|
||||
}
|
||||
double mDef = totalItemDef * lvlBonus * MENbonus;
|
||||
setMagicalDefense((int) Math.round(mDef));
|
||||
_log.fine(getObjectId() + ": new mdef: " + mDef);
|
||||
}
|
||||
|
||||
public void setTradeList(TradeList x)
|
||||
@ -1269,7 +1250,6 @@ public class PlayerInstance extends Creature
|
||||
}
|
||||
if ((skill.getTargetType() == Skill.TARGET_ONE) && (target == this))
|
||||
{
|
||||
_log.fine("Attack magic has no target or target oneself.");
|
||||
return;
|
||||
}
|
||||
if (isDead() || target.isDead() || _allSkillsDisabled || isSkillDisabled(skill.getId()) || skill.isPassive())
|
||||
@ -1419,7 +1399,6 @@ public class PlayerInstance extends Creature
|
||||
{
|
||||
for (PlayerInstance player : getParty().getPartyMembers())
|
||||
{
|
||||
// _log.fine("msl: " + getName() + " " + magicId + " " + level + " " + player.getName());
|
||||
MagicSkillLaunched msl = new MagicSkillLaunched(this, magicId, level, player);
|
||||
sendPacket(msl);
|
||||
broadcastPacket(msl);
|
||||
@ -1428,7 +1407,6 @@ public class PlayerInstance extends Creature
|
||||
else
|
||||
{
|
||||
MagicSkillLaunched msl = new MagicSkillLaunched(this, magicId, level, target);
|
||||
// _log.fine("msl: " + getName() + " " + magicId + " " + level + " " + target.getName());
|
||||
sendPacket(msl);
|
||||
broadcastPacket(msl);
|
||||
}
|
||||
@ -1468,14 +1446,12 @@ public class PlayerInstance extends Creature
|
||||
|
||||
public void disableAllSkills()
|
||||
{
|
||||
_log.fine("all skills disabled");
|
||||
_allSkillsDisabled = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void enableAllSkills()
|
||||
{
|
||||
_log.fine("all skills enabled");
|
||||
_allSkillsDisabled = false;
|
||||
}
|
||||
|
||||
|
@ -57,7 +57,6 @@ public class TeleporterInstance extends NpcInstance
|
||||
@Override
|
||||
public void onAction(PlayerInstance player)
|
||||
{
|
||||
_log.fine("Teleporter activated");
|
||||
super.onAction(player);
|
||||
}
|
||||
|
||||
@ -68,15 +67,12 @@ public class TeleporterInstance extends NpcInstance
|
||||
{
|
||||
if (player.getAdena() >= list.getPrice())
|
||||
{
|
||||
_log.fine("Teleporting to new location: " + list.getLocX() + ":" + list.getLocY() + ":" + list.getLocZ());
|
||||
player.reduceAdena(list.getPrice());
|
||||
_log.fine("Took: " + list.getPrice() + " Adena from player for teleport");
|
||||
TeleportToLocation Tloc = new TeleportToLocation(player, list.getLocX(), list.getLocY(), list.getLocZ());
|
||||
player.sendPacket(Tloc);
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.fine("Not enough adena to teleport");
|
||||
SystemMessage sm = new SystemMessage(279);
|
||||
player.sendPacket(sm);
|
||||
}
|
||||
|
@ -17,8 +17,6 @@
|
||||
*/
|
||||
package org.l2jmobius.gameserver.model.actor.instance;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.data.SkillTreeTable;
|
||||
import org.l2jmobius.gameserver.model.SkillLearn;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||
@ -27,8 +25,6 @@ import org.l2jmobius.gameserver.templates.Npc;
|
||||
|
||||
public class TrainerInstance extends NpcInstance
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(TrainerInstance.class.getName());
|
||||
|
||||
public TrainerInstance(Npc template)
|
||||
{
|
||||
super(template);
|
||||
@ -37,7 +33,6 @@ public class TrainerInstance extends NpcInstance
|
||||
@Override
|
||||
public void onAction(PlayerInstance player)
|
||||
{
|
||||
_log.fine("Trainer activated");
|
||||
super.onAction(player);
|
||||
}
|
||||
|
||||
|
@ -17,8 +17,6 @@
|
||||
*/
|
||||
package org.l2jmobius.gameserver.model.actor.instance;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.data.ClanTable;
|
||||
import org.l2jmobius.gameserver.model.Clan;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate;
|
||||
@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.templates.Npc;
|
||||
|
||||
public class VillageMasterInstance extends NpcInstance
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(VillageMasterInstance.class.getName());
|
||||
|
||||
public VillageMasterInstance(Npc template)
|
||||
{
|
||||
super(template);
|
||||
@ -57,13 +53,11 @@ public class VillageMasterInstance extends NpcInstance
|
||||
@Override
|
||||
public void onAction(PlayerInstance player)
|
||||
{
|
||||
_log.fine("Village Master activated");
|
||||
super.onAction(player);
|
||||
}
|
||||
|
||||
public void createClan(PlayerInstance player, String clanName)
|
||||
{
|
||||
_log.fine(player.getObjectId() + "(" + player.getName() + ") requested clan creation from " + getObjectId() + "(" + getName() + ")");
|
||||
if (player.getLevel() < 10)
|
||||
{
|
||||
SystemMessage sm = new SystemMessage(190);
|
||||
|
@ -38,7 +38,6 @@ public class WarehouseInstance extends NpcInstance
|
||||
@Override
|
||||
public void onAction(PlayerInstance player)
|
||||
{
|
||||
_log.fine("Warehouse activated");
|
||||
super.onAction(player);
|
||||
}
|
||||
|
||||
@ -52,7 +51,6 @@ public class WarehouseInstance extends NpcInstance
|
||||
|
||||
private void showRetrieveWindow(PlayerInstance player)
|
||||
{
|
||||
_log.fine("Showing stored items");
|
||||
Warehouse list = player.getWarehouse();
|
||||
if (list != null)
|
||||
{
|
||||
@ -68,7 +66,6 @@ public class WarehouseInstance extends NpcInstance
|
||||
|
||||
private void showDepositWindow(PlayerInstance player)
|
||||
{
|
||||
_log.fine("Showing items to deposit");
|
||||
WareHouseDepositList dl = new WareHouseDepositList(player);
|
||||
player.sendPacket(dl);
|
||||
player.sendPacket(new ActionFailed());
|
||||
@ -79,7 +76,6 @@ public class WarehouseInstance extends NpcInstance
|
||||
NpcHtmlMessage html = new NpcHtmlMessage(1);
|
||||
html.setHtml("<html><body>Clans are not supported yet.</body></html>");
|
||||
player.sendPacket(html);
|
||||
_log.fine("Showing items to deposit - clan");
|
||||
player.sendPacket(new ActionFailed());
|
||||
}
|
||||
|
||||
@ -88,7 +84,6 @@ public class WarehouseInstance extends NpcInstance
|
||||
NpcHtmlMessage html = new NpcHtmlMessage(1);
|
||||
html.setHtml("<html><body>Clans are not supported yet.</body></html>");
|
||||
player.sendPacket(html);
|
||||
_log.fine("Showing items to deposit - clan");
|
||||
player.sendPacket(new ActionFailed());
|
||||
}
|
||||
|
||||
|
@ -81,7 +81,6 @@ public class ClientThread extends Thread
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
_log.fine("thread[C] started");
|
||||
long starttime = System.currentTimeMillis();
|
||||
try
|
||||
{
|
||||
@ -195,7 +194,6 @@ public class ClientThread extends Thread
|
||||
}
|
||||
throw throwable;
|
||||
}
|
||||
_log.fine("gameserver thread[C] stopped");
|
||||
}
|
||||
|
||||
public void saveCharToDisk(PlayerInstance cha)
|
||||
@ -256,7 +254,6 @@ public class ClientThread extends Thread
|
||||
if (getActiveChar() != null)
|
||||
{
|
||||
saveCharToDisk(getActiveChar());
|
||||
_log.fine("active Char saved");
|
||||
_activeChar = null;
|
||||
}
|
||||
File[] chars = _charFolder.listFiles((FilenameFilter) (dir, name) -> name.endsWith("_char.csv"));
|
||||
|
@ -22,7 +22,6 @@ import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.net.Socket;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.network.serverpackets.ServerBasePacket;
|
||||
@ -86,10 +85,7 @@ public class Connection
|
||||
Connection connection = this;
|
||||
synchronized (connection)
|
||||
{
|
||||
if (_log.isLoggable(Level.FINEST))
|
||||
{
|
||||
_log.finest("\n" + printData(data, data.length));
|
||||
}
|
||||
// _log.config("\n" + printData(data, data.length));
|
||||
_outCrypt.encrypt(data);
|
||||
int length = data.length + 2;
|
||||
_out.write(length & 0xFF);
|
||||
@ -122,6 +118,7 @@ public class Connection
|
||||
_csocket.close();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
private String printData(byte[] data, int len)
|
||||
{
|
||||
int a;
|
||||
|
@ -17,8 +17,6 @@
|
||||
*/
|
||||
package org.l2jmobius.gameserver.network.clientpackets;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.model.World;
|
||||
import org.l2jmobius.gameserver.model.WorldObject;
|
||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||
@ -28,7 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||
public class Action extends ClientBasePacket
|
||||
{
|
||||
private static final String ACTION__C__04 = "[C] 04 Action";
|
||||
private static Logger _log = Logger.getLogger(Action.class.getName());
|
||||
|
||||
public Action(byte[] decrypt, ClientThread client)
|
||||
{
|
||||
@ -41,8 +38,6 @@ public class Action extends ClientBasePacket
|
||||
@SuppressWarnings("unused")
|
||||
int originZ = readD();
|
||||
int actionId = readC();
|
||||
_log.fine("Action:" + actionId);
|
||||
_log.fine("oid:" + objectId);
|
||||
PlayerInstance activeChar = client.getActiveChar();
|
||||
WorldObject obj = World.getInstance().findObject(objectId);
|
||||
if ((obj != null) && !activeChar.isDead() && (activeChar.getPrivateStoreType() == 0) && (activeChar.getTransactionRequester() == null))
|
||||
@ -62,7 +57,6 @@ public class Action extends ClientBasePacket
|
||||
}
|
||||
else
|
||||
{
|
||||
// _log.warning("object not found, oid " + objectId + " or player is dead");
|
||||
activeChar.sendPacket(new ActionFailed());
|
||||
}
|
||||
}
|
||||
|
@ -32,8 +32,10 @@ public class AuthLogin extends ClientBasePacket
|
||||
{
|
||||
super(decrypt);
|
||||
String loginName = readS().toLowerCase();
|
||||
@SuppressWarnings("unused")
|
||||
long key1 = readD();
|
||||
long key2 = readD();
|
||||
|
||||
int access = LoginController.getInstance().getGmAccessLevel(loginName);
|
||||
if (!LoginController.getInstance().loginPossible(access))
|
||||
{
|
||||
@ -41,8 +43,6 @@ public class AuthLogin extends ClientBasePacket
|
||||
client.getConnection().sendPacket(new AuthLoginFail(AuthLoginFail.SYSTEM_ERROR_LOGIN_LATER));
|
||||
return;
|
||||
}
|
||||
_log.fine("user:" + loginName);
|
||||
_log.fine("key:" + Long.toHexString(key1) + " " + Long.toHexString(key2));
|
||||
client.setLoginName(loginName);
|
||||
client.setLoginFolder(loginName);
|
||||
int sessionKey = LoginController.getInstance().getKeyForAccount(loginName);
|
||||
@ -58,7 +58,6 @@ public class AuthLogin extends ClientBasePacket
|
||||
client.getConnection().sendPacket(cl);
|
||||
}
|
||||
client.setAccessLevel(access);
|
||||
_log.fine("access level is set to " + access);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -59,13 +59,11 @@ public class CharacterCreate extends ClientBasePacket
|
||||
newChar.setFace(readD());
|
||||
if (CharNameTable.getInstance().doesCharNameExist(newChar.getName()))
|
||||
{
|
||||
_log.fine("charname: " + newChar.getName() + " already exists. creation failed.");
|
||||
CharCreateFail ccf = new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS);
|
||||
client.getConnection().sendPacket(ccf);
|
||||
}
|
||||
else if ((newChar.getName().length() <= 16) && isAlphaNumeric(newChar.getName()))
|
||||
{
|
||||
_log.fine("charname: " + newChar.getName() + " classId: " + newChar.getClassId());
|
||||
CharCreateOk cco = new CharCreateOk();
|
||||
client.getConnection().sendPacket(cco);
|
||||
initNewChar(client, newChar);
|
||||
@ -73,7 +71,6 @@ public class CharacterCreate extends ClientBasePacket
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.fine("charname: " + newChar.getName() + " is invalid. creation failed.");
|
||||
CharCreateFail ccf = new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS);
|
||||
client.getConnection().sendPacket(ccf);
|
||||
}
|
||||
@ -97,7 +94,6 @@ public class CharacterCreate extends ClientBasePacket
|
||||
|
||||
private void initNewChar(ClientThread client, PlayerInstance newChar) throws FileNotFoundException, IOException
|
||||
{
|
||||
_log.fine("Character init start");
|
||||
newChar.setObjectId(IdFactory.getInstance().getNextId());
|
||||
World.getInstance().storeObject(newChar);
|
||||
CharTemplate template = CharTemplateTable.getInstance().getTemplate(newChar.getClassId());
|
||||
@ -160,12 +156,10 @@ public class CharacterCreate extends ClientBasePacket
|
||||
for (SkillLearn startSkill : SkillTreeTable.getInstance().getAvailableSkills(newChar))
|
||||
{
|
||||
newChar.addSkill(SkillTable.getInstance().getInfo(startSkill.getId(), startSkill.getLevel()));
|
||||
_log.fine("adding starter skill:" + startSkill.getId() + " / " + startSkill.getLevel());
|
||||
}
|
||||
client.saveCharToDisk(newChar);
|
||||
CharSelectInfo cl = new CharSelectInfo(client.getLoginName(), client.getSessionId());
|
||||
client.getConnection().sendPacket(cl);
|
||||
_log.fine("Character init end");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -32,7 +32,6 @@ public class CharacterDelete extends ClientBasePacket
|
||||
{
|
||||
super(decrypt);
|
||||
int charSlot = readD();
|
||||
_log.fine("deleting slot:" + charSlot);
|
||||
Connection con = client.getConnection();
|
||||
client.deleteCharFromDisk(charSlot);
|
||||
CharDeleteOk ccf = new CharDeleteOk();
|
||||
|
@ -33,9 +33,11 @@ public class RequestActionUse extends ClientBasePacket
|
||||
{
|
||||
super(rawPacket);
|
||||
int actionId = readD();
|
||||
@SuppressWarnings("unused")
|
||||
int data2 = readD();
|
||||
@SuppressWarnings("unused")
|
||||
int data3 = readC();
|
||||
_log.fine("request Action use: id " + actionId + " 2:" + data2 + " 3:" + data3);
|
||||
|
||||
PlayerInstance activeChar = client.getActiveChar();
|
||||
if (activeChar.isDead())
|
||||
{
|
||||
@ -47,7 +49,6 @@ public class RequestActionUse extends ClientBasePacket
|
||||
case 0:
|
||||
{
|
||||
int waitType = activeChar.getWaitType() ^ 1;
|
||||
_log.fine("new wait type: " + waitType);
|
||||
ChangeWaitType cmt = new ChangeWaitType(activeChar, waitType);
|
||||
activeChar.setWaitType(waitType);
|
||||
activeChar.sendPacket(cmt);
|
||||
@ -57,7 +58,6 @@ public class RequestActionUse extends ClientBasePacket
|
||||
case 1:
|
||||
{
|
||||
int moveType = activeChar.getMoveType() ^ 1;
|
||||
_log.fine("new move type: " + moveType);
|
||||
ChangeMoveType cmt = new ChangeMoveType(activeChar, moveType);
|
||||
activeChar.setMoveType(moveType);
|
||||
activeChar.sendPacket(cmt);
|
||||
|
@ -31,7 +31,6 @@ public class RequestAllyCrest extends ClientBasePacket
|
||||
{
|
||||
super(rawPacket);
|
||||
int crestId = readD();
|
||||
// _log.fine("allycrestid " + crestId + " requested");
|
||||
File crestFile = new File("data/allycrest_" + crestId + ".bmp");
|
||||
if (crestFile.exists())
|
||||
{
|
||||
|
@ -57,7 +57,6 @@ public class RequestAquireSkill extends ClientBasePacket
|
||||
if (player.getSp() >= _requiredSp)
|
||||
{
|
||||
player.addSkill(skill);
|
||||
_log.fine("Learned skill " + id + " for " + _requiredSp + " SP.");
|
||||
player.setSp(player.getSp() - _requiredSp);
|
||||
StatusUpdate su = new StatusUpdate(player.getObjectId());
|
||||
su.addAttribute(StatusUpdate.SP, player.getSp());
|
||||
@ -82,7 +81,6 @@ public class RequestAquireSkill extends ClientBasePacket
|
||||
{
|
||||
SystemMessage sm = new SystemMessage(278);
|
||||
player.sendPacket(sm);
|
||||
_log.fine("Not enough SP!");
|
||||
}
|
||||
skills = SkillTreeTable.getInstance().getAvailableSkills(player);
|
||||
AquireSkillList asl = new AquireSkillList();
|
||||
|
@ -57,16 +57,13 @@ public class RequestDropItem extends ClientBasePacket
|
||||
return;
|
||||
}
|
||||
int oldCount = oldItem.getCount();
|
||||
_log.fine("requested drop item " + objectId + "(" + oldCount + ") at " + x + "/" + y + "/" + z);
|
||||
ItemInstance dropedItem = null;
|
||||
if (oldCount < count)
|
||||
{
|
||||
_log.finest(activeChar.getObjectId() + ":player tried to drop more items than he has");
|
||||
return;
|
||||
}
|
||||
if ((activeChar.getDistance(x, y) > 150.0) || (Math.abs(z - activeChar.getZ()) > 50))
|
||||
{
|
||||
_log.finest(activeChar.getObjectId() + ": trying to drop too far away");
|
||||
SystemMessage sm = new SystemMessage(151);
|
||||
activeChar.sendPacket(sm);
|
||||
return;
|
||||
@ -88,7 +85,6 @@ public class RequestDropItem extends ClientBasePacket
|
||||
dropedItem.setY(y);
|
||||
dropedItem.setZ(z);
|
||||
dropedItem.setOnTheGround(true);
|
||||
_log.fine("dropping " + objectId + " item(" + count + ") at: " + x + " " + y + " " + z);
|
||||
DropItem di = new DropItem(dropedItem, activeChar.getObjectId());
|
||||
activeChar.sendPacket(di);
|
||||
activeChar.addKnownObjectWithoutCreate(dropedItem);
|
||||
@ -99,12 +95,10 @@ public class RequestDropItem extends ClientBasePacket
|
||||
InventoryUpdate iu = new InventoryUpdate();
|
||||
if (oldCount == dropedItem.getCount())
|
||||
{
|
||||
_log.finest("remove item from inv");
|
||||
iu.addRemovedItem(oldItem);
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.finest("reducing item in inv");
|
||||
iu.addModifiedItem(oldItem);
|
||||
}
|
||||
con.sendPacket(iu);
|
||||
|
@ -39,7 +39,6 @@ public class RequestJoinParty extends ClientBasePacket
|
||||
{
|
||||
SystemMessage msg = new SystemMessage(164);
|
||||
requestor.sendPacket(msg);
|
||||
_log.fine("player already invited someone.");
|
||||
return;
|
||||
}
|
||||
if (target.isInParty())
|
||||
@ -79,7 +78,6 @@ public class RequestJoinParty extends ClientBasePacket
|
||||
requestor.setTransactionRequester(target);
|
||||
AskJoinParty ask = new AskJoinParty(requestor.getObjectId(), itemDistribution);
|
||||
target.sendPacket(ask);
|
||||
_log.fine("sent out a party invitation to:" + target.getName());
|
||||
SystemMessage msg = new SystemMessage(105);
|
||||
msg.addString(target.getName());
|
||||
requestor.sendPacket(msg);
|
||||
@ -108,7 +106,6 @@ public class RequestJoinParty extends ClientBasePacket
|
||||
requestor.setTransactionRequester(target);
|
||||
AskJoinParty ask = new AskJoinParty(requestor.getObjectId(), itemDistribution);
|
||||
target.sendPacket(ask);
|
||||
_log.fine("sent out a party invitation to:" + target.getName());
|
||||
SystemMessage msg = new SystemMessage(105);
|
||||
msg.addString(target.getName());
|
||||
requestor.sendPacket(msg);
|
||||
|
@ -38,7 +38,6 @@ public class RequestJoinPledge extends ClientBasePacket
|
||||
if (activeChar.isTransactionInProgress())
|
||||
{
|
||||
activeChar.sendPacket(new SystemMessage(164));
|
||||
_log.fine("player is already doing some other action");
|
||||
return;
|
||||
}
|
||||
if (target == activeChar.getObjectId())
|
||||
|
@ -36,14 +36,14 @@ public class RequestPartyMatchList extends ClientBasePacket
|
||||
PartyMatchList matchList = new PartyMatchList(World.getInstance().getAllPlayers());
|
||||
client.getConnection().sendPacket(matchList);
|
||||
}
|
||||
else if (status == 3)
|
||||
{
|
||||
_log.fine("PartyMatch window was closed.");
|
||||
}
|
||||
else
|
||||
{
|
||||
_log.fine("party match status: " + status);
|
||||
}
|
||||
// else if (status == 3)
|
||||
// {
|
||||
// _log.fine("PartyMatch window was closed.");
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// _log.fine("Party match status: " + status);
|
||||
// }
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -31,7 +31,6 @@ public class RequestPledgeCrest extends ClientBasePacket
|
||||
{
|
||||
super(rawPacket);
|
||||
int crestId = readD();
|
||||
_log.fine("crestid " + crestId + " requested");
|
||||
File crestFile = new File("data/crests/Pledge_" + crestId + ".bmp");
|
||||
if (crestFile.exists())
|
||||
{
|
||||
|
@ -32,7 +32,6 @@ public class RequestPledgeInfo extends ClientBasePacket
|
||||
{
|
||||
super(rawPacket);
|
||||
int clanId = readD();
|
||||
_log.fine("infos for clan " + clanId + " requested");
|
||||
PlayerInstance activeChar = client.getActiveChar();
|
||||
Clan clan = ClanTable.getInstance().getClan(clanId);
|
||||
if (clan == null)
|
||||
|
@ -32,7 +32,6 @@ public class RequestSocialAction extends ClientBasePacket
|
||||
PlayerInstance activeChar = client.getActiveChar();
|
||||
if ((activeChar.getPrivateStoreType() == 0) && (activeChar.getTransactionRequester() == null) && (activeChar.getCurrentState() == 0))
|
||||
{
|
||||
_log.fine("Social Action:" + actionId);
|
||||
SocialAction atk = new SocialAction(client.getActiveChar().getObjectId(), actionId);
|
||||
activeChar.sendPacket(atk);
|
||||
activeChar.broadcastPacket(atk);
|
||||
|
@ -35,7 +35,6 @@ public class RequestUnEquipItem extends ClientBasePacket
|
||||
{
|
||||
super(decrypt);
|
||||
int slot = readD();
|
||||
_log.fine("request unequip slot " + slot);
|
||||
PlayerInstance activeChar = client.getActiveChar();
|
||||
Collection<ItemInstance> unequiped = activeChar.getInventory().unEquipItemInBodySlot(slot);
|
||||
InventoryUpdate iu = new InventoryUpdate();
|
||||
|
@ -48,7 +48,6 @@ public class Say2 extends ClientBasePacket
|
||||
{
|
||||
target = readS();
|
||||
}
|
||||
_log.fine("Say type:" + type);
|
||||
PlayerInstance activeChar = client.getActiveChar();
|
||||
// Connection con = client.getConnection();
|
||||
CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text);
|
||||
|
@ -29,13 +29,16 @@ public class StopMove extends ClientBasePacket
|
||||
public StopMove(byte[] decrypt, ClientThread client)
|
||||
{
|
||||
super(decrypt);
|
||||
@SuppressWarnings("unused")
|
||||
int x = readD();
|
||||
@SuppressWarnings("unused")
|
||||
int y = readD();
|
||||
@SuppressWarnings("unused")
|
||||
int z = readD();
|
||||
int heading = readD();
|
||||
|
||||
PlayerInstance player = client.getActiveChar();
|
||||
player.stopMove();
|
||||
_log.fine("client: x:" + x + " y:" + y + " z:" + z + " server x:" + player.getX() + " y:" + player.getZ() + " z:" + player.getZ());
|
||||
StopMoveWithLocation smwl = new StopMoveWithLocation(player);
|
||||
client.getActiveChar().sendPacket(smwl);
|
||||
client.getActiveChar().broadcastPacket(smwl);
|
||||
|
@ -42,7 +42,6 @@ public class TradeRequest extends ClientBasePacket
|
||||
}
|
||||
if (client.getActiveChar().getTransactionRequester() != null)
|
||||
{
|
||||
_log.fine("already trading with someone");
|
||||
player.sendPacket(new SystemMessage(142));
|
||||
return;
|
||||
}
|
||||
|
@ -38,7 +38,6 @@ public class UseItem extends ClientBasePacket
|
||||
{
|
||||
super(decrypt);
|
||||
int objectId = readD();
|
||||
_log.fine("use item:" + objectId);
|
||||
PlayerInstance activeChar = client.getActiveChar();
|
||||
ItemInstance item = activeChar.getInventory().getItem(objectId);
|
||||
if ((item != null) && item.isEquipable() && !activeChar.isInCombat())
|
||||
@ -70,7 +69,6 @@ public class UseItem extends ClientBasePacket
|
||||
}
|
||||
else if (item != null)
|
||||
{
|
||||
_log.fine("item not equipable id:" + item.getItemId());
|
||||
IItemHandler handler = ItemHandler.getInstance().getItemHandler(item.getItemId());
|
||||
if (handler == null)
|
||||
{
|
||||
|
@ -80,9 +80,7 @@ public class ValidatePosition extends ClientBasePacket
|
||||
}
|
||||
toBeDeleted.get(i).removeKnownObject(activeChar);
|
||||
}
|
||||
_log.fine("deleted " + delete + " objects");
|
||||
}
|
||||
int newObjects = 0;
|
||||
for (WorldObject worldObject : World.getInstance().getVisibleObjects(activeChar, 3000))
|
||||
{
|
||||
if (activeChar.knownsObject(worldObject))
|
||||
@ -91,11 +89,6 @@ public class ValidatePosition extends ClientBasePacket
|
||||
}
|
||||
activeChar.addKnownObject(worldObject);
|
||||
worldObject.addKnownObject(activeChar);
|
||||
++newObjects;
|
||||
}
|
||||
if (newObjects > 0)
|
||||
{
|
||||
_log.fine("added " + newObjects + " new objects");
|
||||
}
|
||||
activeChar.updateKnownCounter = 0;
|
||||
}
|
||||
|
@ -42,7 +42,6 @@ public class AquireSkillList extends ServerBasePacket
|
||||
writeD(temp.maxLevel);
|
||||
writeD(temp.spCost);
|
||||
writeD(temp.requirements);
|
||||
// _log.fine("skill: " + temp.id + " " + temp.nextLevel + " " + temp.maxLevel + " " + temp.spCost + " " + temp.requirements);
|
||||
}
|
||||
return getBytes();
|
||||
}
|
||||
|
@ -128,7 +128,6 @@ public class CharSelectInfo extends ServerBasePacket
|
||||
File _charFolder = new File("data/accounts", _loginName);
|
||||
_charFolder.mkdirs();
|
||||
File[] chars = _charFolder.listFiles((FilenameFilter) (dir, name) -> name.endsWith("_char.csv"));
|
||||
// _log.fine("found " + chars.length + " characters on disk.");
|
||||
_charNameList = new String[chars.length];
|
||||
CharSelectInfoPackage[] characters = new CharSelectInfoPackage[chars.length];
|
||||
for (int i = 0; i < chars.length; ++i)
|
||||
|
@ -110,7 +110,6 @@ public class EquipUpdate extends ServerBasePacket
|
||||
bodypart = 14;
|
||||
}
|
||||
}
|
||||
// _log.fine("body:" + bodypart);
|
||||
writeD(bodypart);
|
||||
return _bao.toByteArray();
|
||||
}
|
||||
|
@ -65,7 +65,6 @@ public class InventoryUpdate extends ServerBasePacket
|
||||
for (int i = 0; i < count; ++i)
|
||||
{
|
||||
ItemInstance temp = _items.get(i);
|
||||
// _log.fine("oid:" + Integer.toHexString(temp.getObjectId()) + " item:" + temp.getItem().getName() + " last change:" + temp.getLastChange());
|
||||
writeH(temp.getLastChange());
|
||||
writeH(temp.getItem().getType1());
|
||||
writeD(temp.getObjectId());
|
||||
|
@ -65,7 +65,6 @@ public class PetInventoryUpdate extends ServerBasePacket
|
||||
for (int i = 0; i < count; ++i)
|
||||
{
|
||||
ItemInstance temp = _items.get(i);
|
||||
// _log.fine("oid:" + Integer.toHexString(temp.getObjectId()) + " item:" + temp.getItem().getName() + " last change:" + temp.getLastChange());
|
||||
writeH(temp.getLastChange());
|
||||
writeH(temp.getItem().getType1());
|
||||
writeD(temp.getObjectId());
|
||||
|
@ -19,17 +19,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public abstract class ServerBasePacket
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(ServerBasePacket.class.getName());
|
||||
// private static Logger _log = Logger.getLogger(ServerBasePacket.class.getName());
|
||||
|
||||
ByteArrayOutputStream _bao = new ByteArrayOutputStream();
|
||||
|
||||
protected ServerBasePacket()
|
||||
{
|
||||
_log.finest(getType());
|
||||
// _log.finest(getType());
|
||||
}
|
||||
|
||||
protected void writeD(int value)
|
||||
|
@ -19,14 +19,12 @@ package org.l2jmobius.gameserver.network.serverpackets;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.model.actor.instance.ItemInstance;
|
||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||
|
||||
public class WareHouseDepositList extends ServerBasePacket
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(WareHouseDepositList.class.getName());
|
||||
private static final String _S__53_WAREHOUSEDEPOSITLIST = "[S] 53 WareHouseDepositList";
|
||||
private final PlayerInstance _cha;
|
||||
private final int _money;
|
||||
@ -54,12 +52,10 @@ public class WareHouseDepositList extends ServerBasePacket
|
||||
itemlist.add(item);
|
||||
}
|
||||
count = itemlist.size();
|
||||
_log.fine("count:" + count);
|
||||
writeH(count);
|
||||
for (i = 0; i < count; ++i)
|
||||
{
|
||||
ItemInstance temp = itemlist.get(i);
|
||||
_log.fine("item:" + temp.getItem().getName() + " type1:" + temp.getItem().getType1() + " type2:" + temp.getItem().getType2());
|
||||
writeH(temp.getItem().getType1());
|
||||
writeD(temp.getObjectId());
|
||||
writeD(temp.getItemId());
|
||||
|
@ -18,14 +18,12 @@
|
||||
package org.l2jmobius.gameserver.network.serverpackets;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.l2jmobius.gameserver.model.actor.instance.ItemInstance;
|
||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||
|
||||
public class WareHouseWithdrawalList extends ServerBasePacket
|
||||
{
|
||||
private static Logger _log = Logger.getLogger(WareHouseWithdrawalList.class.getName());
|
||||
private static final String _S__54_WAREHOUSEWITHDRAWALLIST = "[S] 54 WareHouseWithdrawalList";
|
||||
private final PlayerInstance _cha;
|
||||
private final int _money;
|
||||
@ -47,7 +45,6 @@ public class WareHouseWithdrawalList extends ServerBasePacket
|
||||
for (int i = 0; i < count; ++i)
|
||||
{
|
||||
ItemInstance temp = items.get(i);
|
||||
_log.fine("item:" + temp.getItem().getName() + " type1:" + temp.getItem().getType1() + " type2:" + temp.getItem().getType2());
|
||||
writeH(temp.getItem().getType1());
|
||||
writeD(temp.getObjectId());
|
||||
writeD(temp.getItemId());
|
||||
|
@ -57,15 +57,15 @@ public class LoginServer extends Thread
|
||||
{
|
||||
// _log.fine("Waiting for client connection...");
|
||||
Socket connection = _serverSocket.accept();
|
||||
_log.fine("Connection from " + connection.getInetAddress());
|
||||
// _log.fine("Connection from " + connection.getInetAddress());
|
||||
String connectedIp = connection.getInetAddress().getHostAddress();
|
||||
if (connectedIp.startsWith("192.168.") || connectedIp.startsWith("10."))
|
||||
{
|
||||
_log.fine("Using internal ip as server ip " + Config.INTERNAL_HOST_NAME);
|
||||
// _log.fine("Using internal ip as server ip " + Config.INTERNAL_HOST_NAME);
|
||||
new ClientThread(connection, _logins, Config.INTERNAL_HOST_NAME, _gamePort);
|
||||
continue;
|
||||
}
|
||||
_log.fine("Using external ip as server ip " + Config.EXTERNAL_HOST_NAME);
|
||||
// _log.fine("Using external ip as server ip " + Config.EXTERNAL_HOST_NAME);
|
||||
new ClientThread(connection, _logins, Config.EXTERNAL_HOST_NAME, _gamePort);
|
||||
}
|
||||
while (true);
|
||||
|
@ -31,7 +31,6 @@ import org.l2jmobius.Config;
|
||||
import org.l2jmobius.loginserver.LoginController;
|
||||
import org.l2jmobius.loginserver.data.AccountData;
|
||||
import org.l2jmobius.loginserver.network.clientpackets.RequestAuthLogin;
|
||||
import org.l2jmobius.loginserver.network.clientpackets.RequestServerLogin;
|
||||
import org.l2jmobius.loginserver.network.serverpackets.Init;
|
||||
import org.l2jmobius.loginserver.network.serverpackets.LoginFail;
|
||||
import org.l2jmobius.loginserver.network.serverpackets.LoginOk;
|
||||
@ -71,7 +70,6 @@ public class ClientThread extends Thread
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
_log.fine("loginserver thread[C] started");
|
||||
int lengthHi = 0;
|
||||
int lengthLo = 0;
|
||||
int length = 0;
|
||||
@ -96,7 +94,6 @@ public class ClientThread extends Thread
|
||||
length = (lengthHi * 256) + lengthLo;
|
||||
if (lengthHi < 0)
|
||||
{
|
||||
// _log.finer("Client terminated the connection.");
|
||||
break;
|
||||
}
|
||||
byte[] incoming = new byte[length];
|
||||
@ -117,7 +114,6 @@ public class ClientThread extends Thread
|
||||
System.arraycopy(incoming, 2, decrypt, 0, decrypt.length);
|
||||
decrypt = _crypt.decrypt(decrypt);
|
||||
checksumOk = _crypt.checksum(decrypt);
|
||||
_log.finest("[C]\n" + printData(decrypt, decrypt.length));
|
||||
int packetType = decrypt[0] & 255;
|
||||
switch (packetType)
|
||||
{
|
||||
@ -125,7 +121,6 @@ public class ClientThread extends Thread
|
||||
{
|
||||
RequestAuthLogin ral = new RequestAuthLogin(decrypt);
|
||||
account = ral.getUser().toLowerCase();
|
||||
_log.fine("RequestAuthLogin from user:" + account);
|
||||
LoginController lc = LoginController.getInstance();
|
||||
if (_logins.loginValid(account, ral.getPassword(), _csocket.getInetAddress()))
|
||||
{
|
||||
@ -139,12 +134,10 @@ public class ClientThread extends Thread
|
||||
break;
|
||||
}
|
||||
sessionKey = lc.assignSessionKeyToLogin(account, accessLevel, _csocket);
|
||||
_log.fine("assigned SessionKey:" + Integer.toHexString(sessionKey));
|
||||
LoginOk lok = new LoginOk();
|
||||
sendPacket(lok);
|
||||
break;
|
||||
}
|
||||
_log.fine("KICKING!");
|
||||
if (lc.isAccountInLoginServer(account))
|
||||
{
|
||||
_log.warning("account is in use on Login server (kicking off):" + account);
|
||||
@ -167,16 +160,13 @@ public class ClientThread extends Thread
|
||||
}
|
||||
case 2:
|
||||
{
|
||||
_log.fine("RequestServerLogin");
|
||||
RequestServerLogin rsl = new RequestServerLogin(decrypt);
|
||||
_log.fine("login to server:" + rsl.getData3());
|
||||
// RequestServerLogin rsl = new RequestServerLogin(decrypt);
|
||||
PlayOk po = new PlayOk(sessionKey);
|
||||
sendPacket(po);
|
||||
break;
|
||||
}
|
||||
case 5:
|
||||
{
|
||||
_log.fine("RequestServerList");
|
||||
// RequestServerList rsl = new RequestServerList(decrypt);
|
||||
ServerList sl = new ServerList();
|
||||
int current = LoginController.getInstance().getOnlinePlayerCount();
|
||||
@ -202,7 +192,6 @@ public class ClientThread extends Thread
|
||||
{
|
||||
}
|
||||
LoginController.getInstance().removeLoginServerLogin(account);
|
||||
_log.fine("loginserver thread[C] stopped");
|
||||
return;
|
||||
}
|
||||
catch (HackingException e)
|
||||
@ -216,7 +205,6 @@ public class ClientThread extends Thread
|
||||
{
|
||||
}
|
||||
LoginController.getInstance().removeLoginServerLogin(account);
|
||||
_log.fine("loginserver thread[C] stopped");
|
||||
return;
|
||||
}
|
||||
catch (Exception e)
|
||||
@ -231,7 +219,6 @@ public class ClientThread extends Thread
|
||||
// empty catch block
|
||||
}
|
||||
LoginController.getInstance().removeLoginServerLogin(account);
|
||||
_log.fine("loginserver thread[C] stopped");
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -240,7 +227,6 @@ public class ClientThread extends Thread
|
||||
{
|
||||
byte[] data = sl.getContent();
|
||||
_crypt.checksum(data);
|
||||
_log.finest("[S]\n" + printData(data, data.length));
|
||||
data = _crypt.crypt(data);
|
||||
int len = data.length + 2;
|
||||
_out.write(len & 0xFF);
|
||||
|
Loading…
Reference in New Issue
Block a user