Removal of unused object id from GameClient class.
This commit is contained in:
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,6 @@ import org.l2jmobius.gameserver.LoginServerThread.SessionKey;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.model.CharSelectInfoPackage;
|
import org.l2jmobius.gameserver.model.CharSelectInfoPackage;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@@ -63,8 +62,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -91,15 +88,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -121,7 +112,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
|
|||||||
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
|
||||||
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
|
||||||
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
|
||||||
import org.l2jmobius.gameserver.idfactory.IdFactory;
|
|
||||||
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
import org.l2jmobius.gameserver.instancemanager.CommissionManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
import org.l2jmobius.gameserver.instancemanager.MailManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
|
||||||
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
|
||||||
|
|
||||||
private final int _objectId;
|
|
||||||
|
|
||||||
// Info
|
// Info
|
||||||
private InetAddress _addr;
|
private InetAddress _addr;
|
||||||
private Channel _channel;
|
private Channel _channel;
|
||||||
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
public GameClient()
|
public GameClient()
|
||||||
{
|
{
|
||||||
_objectId = IdFactory.getInstance().getNextId();
|
|
||||||
_crypt = new Crypt(this);
|
_crypt = new Crypt(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getObjectId()
|
|
||||||
{
|
|
||||||
return _objectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx)
|
public void channelActive(ChannelHandlerContext ctx)
|
||||||
{
|
{
|
||||||
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
|
|||||||
|
|
||||||
if ((_player == null) || !_player.isInOfflineMode())
|
if ((_player == null) || !_player.isInOfflineMode())
|
||||||
{
|
{
|
||||||
IdFactory.getInstance().releaseId(getObjectId());
|
|
||||||
Disconnection.of(this).onDisconnection();
|
Disconnection.of(this).onDisconnection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user