Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-05 23:22:47 +00:00
Code Releases Activity

Renamed Lineage2Connection to Lineage2Client to better match its

Browse Source 
purpose

Signed-off-by: Rogiel <rogiel@rogiel.com>
This commit is contained in:
Rogiel Sulzbach
2011-07-29 16:22:05 -03:00
parent ebb2b2a81a
commit f917602de1
89 changed files with 258 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
data/database.trace.db
View File

@@ -1,47 +0,0 @@
05-30 18:40:23 jdbc[2]: exception
org.h2.jdbc.JdbcSQLException: Database is already closed (to disable automatic closing at VM shutdown, add ";DB_CLOSE_ON_EXIT=FALSE" to the db URL) [90121-155]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:327)
at org.h2.message.DbException.get(DbException.java:167)
at org.h2.message.DbException.get(DbException.java:144)
at org.h2.message.DbException.get(DbException.java:133)
at org.h2.jdbc.JdbcConnection.checkClosed(JdbcConnection.java:1363)
at org.h2.jdbc.JdbcConnection.checkClosed(JdbcConnection.java:1338)
at org.h2.jdbc.JdbcConnection.getAutoCommit(JdbcConnection.java:395)
at org.apache.commons.dbcp.DelegatingConnection.getAutoCommit(DelegatingConnection.java:337)
at org.apache.commons.dbcp.PoolableConnectionFactory.activateObject(PoolableConnectionFactory.java:703)
at org.apache.commons.pool.impl.GenericObjectPool.borrowObject(GenericObjectPool.java:1197)
at org.apache.commons.dbcp.PoolingDataSource.getConnection(PoolingDataSource.java:106)
at com.l2jserver.service.database.JDBCDatabaseService.query(JDBCDatabaseService.java:170)
at com.l2jserver.db.dao.jdbc.JDBCCharacterDAO.selectByAccount(JDBCCharacterDAO.java:251)
at com.l2jserver.game.net.packet.client.CM_AUTH_LOGIN.process(CM_AUTH_LOGIN.java:88)
at com.l2jserver.game.net.handler.Lineage2PacketHandler.messageReceived(Lineage2PacketHandler.java:83)
at org.jboss.netty.channel.SimpleChannelHandler.handleUpstream(SimpleChannelHandler.java:100)
at org.jboss.netty.channel.DefaultChannelPipeline.sendUpstream(DefaultChannelPipeline.java:545)
at org.jboss.netty.channel.DefaultChannelPipeline$DefaultChannelHandlerContext.sendUpstream(DefaultChannelPipeline.java:754)
at org.jboss.netty.handler.logging.LoggingHandler.handleUpstream(LoggingHandler.java:231)
at org.jboss.netty.channel.DefaultChannelPipeline.sendUpstream(DefaultChannelPipeline.java:545)
at org.jboss.netty.channel.DefaultChannelPipeline$DefaultChannelHandlerContext.sendUpstream(DefaultChannelPipeline.java:754)
at org.jboss.netty.channel.Channels.fireMessageReceived(Channels.java:302)
at org.jboss.netty.handler.codec.oneone.OneToOneDecoder.handleUpstream(OneToOneDecoder.java:76)
at org.jboss.netty.channel.DefaultChannelPipeline.sendUpstream(DefaultChannelPipeline.java:545)
at org.jboss.netty.channel.DefaultChannelPipeline$DefaultChannelHandlerContext.sendUpstream(DefaultChannelPipeline.java:754)
at org.jboss.netty.handler.codec.oneone.OneToOneDecoder.handleUpstream(OneToOneDecoder.java:74)
at org.jboss.netty.channel.DefaultChannelPipeline.sendUpstream(DefaultChannelPipeline.java:545)
at org.jboss.netty.channel.DefaultChannelPipeline$DefaultChannelHandlerContext.sendUpstream(DefaultChannelPipeline.java:754)
at org.jboss.netty.channel.Channels.fireMessageReceived(Channels.java:302)
at org.jboss.netty.handler.codec.frame.FrameDecoder.unfoldAndFireMessageReceived(FrameDecoder.java:317)
at org.jboss.netty.handler.codec.frame.FrameDecoder.callDecode(FrameDecoder.java:299)
at org.jboss.netty.handler.codec.frame.FrameDecoder.messageReceived(FrameDecoder.java:216)
at org.jboss.netty.channel.SimpleChannelUpstreamHandler.handleUpstream(SimpleChannelUpstreamHandler.java:80)
at org.jboss.netty.channel.DefaultChannelPipeline.sendUpstream(DefaultChannelPipeline.java:545)
at org.jboss.netty.channel.DefaultChannelPipeline.sendUpstream(DefaultChannelPipeline.java:540)
at org.jboss.netty.channel.Channels.fireMessageReceived(Channels.java:274)
at org.jboss.netty.channel.Channels.fireMessageReceived(Channels.java:261)
at org.jboss.netty.channel.socket.nio.NioWorker.read(NioWorker.java:349)
at org.jboss.netty.channel.socket.nio.NioWorker.processSelectedKeys(NioWorker.java:280)
at org.jboss.netty.channel.socket.nio.NioWorker.run(NioWorker.java:200)
at org.jboss.netty.util.ThreadRenamingRunnable.run(ThreadRenamingRunnable.java:108)
at org.jboss.netty.util.internal.DeadLockProofWorker$1.run(DeadLockProofWorker.java:44)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:662)

7
pom.xml
View File

@@ -114,13 +114,6 @@
<type>jar</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.java.dev.javacc</groupId>
<artifactId>javacc</artifactId>
<version>4.1</version>
<type>jar</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>

8
src/main/java/com/l2jserver/game/net/Lineage2Connection.java → src/main/java/com/l2jserver/game/net/Lineage2Client.java
View File

@@ -49,7 +49,7 @@ import com.l2jserver.util.html.markup.HtmlTemplate;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class Lineage2Connection {
public class Lineage2Client {
/**
* The connection channel
*/
@@ -85,7 +85,7 @@ public class Lineage2Connection {
// services
/**
* The {@link NetworkService} instance. This service is used to retrieve the
* {@link Lineage2Connection} based on an {@link CharacterID}.
* {@link Lineage2Client} based on an {@link CharacterID}.
*/
private final NetworkService networkService;
/**
@@ -102,7 +102,7 @@ public class Lineage2Connection {
* @param channel
* the channel
*/
public Lineage2Connection(WorldService worldService,
public Lineage2Client(WorldService worldService,
NetworkService networkService, Channel channel) {
this.worldService = worldService;
this.networkService = networkService;
@@ -364,7 +364,7 @@ public class Lineage2Connection {
final Set<ChannelFuture> futures = CollectionFactory.newSet();
for (final L2Character character : worldService
.iterable(new CharacterBroadcastFilter(characterID.getObject()))) {
final Lineage2Connection conn = networkService.discover(character
final Lineage2Client conn = networkService.discover(character
.getID());
if (conn == null)
continue;

8
src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java
View File

@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.ClientPacket;
import com.l2jserver.game.net.packet.client.CM_ACTION_USE;
import com.l2jserver.game.net.packet.client.CM_ADMIN_COMMAND;
@@ -81,7 +81,7 @@ public class Lineage2PacketReader extends OneToOneDecoder {
/**
* The active Lineage 2 connection
*/
private Lineage2Connection connection;
private Lineage2Client connection;
/**
* Creates a new instance
@@ -197,7 +197,7 @@ public class Lineage2PacketReader extends OneToOneDecoder {
/**
* @return the connection
*/
public Lineage2Connection getConnection() {
public Lineage2Client getConnection() {
return connection;
}
@@ -205,7 +205,7 @@ public class Lineage2PacketReader extends OneToOneDecoder {
* @param connection
* the connection to set
*/
public void setConnection(Lineage2Connection connection) {
public void setConnection(Lineage2Client connection) {
this.connection = connection;
}
}

8
src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java
View File

@@ -24,7 +24,7 @@ import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.ServerPacket;
/**
@@ -43,7 +43,7 @@ public class Lineage2PacketWriter extends OneToOneEncoder {
/**
* The active Lineage 2 connection
*/
private Lineage2Connection connection;
private Lineage2Client connection;
@Override
protected Object encode(ChannelHandlerContext ctx, Channel channel,
@@ -63,7 +63,7 @@ public class Lineage2PacketWriter extends OneToOneEncoder {
/**
* @return the connection
*/
public Lineage2Connection getConnection() {
public Lineage2Client getConnection() {
return connection;
}
@@ -71,7 +71,7 @@ public class Lineage2PacketWriter extends OneToOneEncoder {
* @param connection
* the connection to set
*/
public void setConnection(Lineage2Connection connection) {
public void setConnection(Lineage2Client connection) {
this.connection = connection;
}
}

10
src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java
View File

@@ -26,7 +26,7 @@ import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelHandler;
import com.google.common.base.Throwables;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.ClientPacket;
import com.l2jserver.service.game.world.WorldService;
import com.l2jserver.service.network.NettyNetworkService;
@@ -34,8 +34,8 @@ import com.l2jserver.util.html.markup.HtmlTemplate;
import com.l2jserver.util.html.markup.MarkupTag;
/**
* This handler dispatches the {@link ClientPacket#process(Lineage2Connection)}
* method and creates a new {@link Lineage2Connection} once a new channel is
* This handler dispatches the {@link ClientPacket#process(Lineage2Client)}
* method and creates a new {@link Lineage2Client} once a new channel is
* open.
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
@@ -52,7 +52,7 @@ public class Lineage2PacketHandler extends SimpleChannelHandler {
/**
* The Lineage 2 connection
*/
private Lineage2Connection connection;
private Lineage2Client connection;
public Lineage2PacketHandler(NettyNetworkService nettyNetworkService,
WorldService worldService) {
@@ -63,7 +63,7 @@ public class Lineage2PacketHandler extends SimpleChannelHandler {
@Override
public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e)
throws Exception {
connection = new Lineage2Connection(worldService, nettyNetworkService,
connection = new Lineage2Client(worldService, nettyNetworkService,
e.getChannel());
connection.getPacketWriter().setConnection(connection);

10
src/main/java/com/l2jserver/game/net/packet/ClientPacket.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
/**
* Each implementation is an packet sent by the game client.
@@ -30,14 +30,14 @@ public interface ClientPacket extends Packet {
* Read binary data in the {@link ChannelBuffer}.
* <p>
* Please do not write packets from this method. If you need to close the
* connection or write packets do it in {@link #process(Lineage2Connection)}.
* connection or write packets do it in {@link #process(Lineage2Client)}.
*
* @param conn
* @param client
* the active connection
* @param buffer
* the buffer
*/
void read(Lineage2Connection conn, ChannelBuffer buffer);
void read(Lineage2Client client, ChannelBuffer buffer);
/**
* Process the packet. Executes all needed operations.
@@ -45,5 +45,5 @@ public interface ClientPacket extends Packet {
* @param conn
* The active Lineage2Connection
*/
void process(Lineage2Connection conn);
void process(Lineage2Client conn);
}

6
src/main/java/com/l2jserver/game/net/packet/ServerPacket.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
/**
* Each implementation is an packet sent by the game server.
@@ -32,12 +32,12 @@ public interface ServerPacket extends Packet {
* Please do not write packets from this method! This is only used to test
* compatibility of protocols.
*
* @param conn
* @param client
* the connection
* @param buffer
* the buffer
*/
void write(Lineage2Connection conn, ChannelBuffer buffer);
void write(Lineage2Client client, ChannelBuffer buffer);
/**
* Get the opcode id of this packet

6
src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java
View File

@@ -19,7 +19,7 @@ package com.l2jserver.game.net.packet.client;
import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.model.world.L2Character.CharacterMoveType;
@@ -91,14 +91,14 @@ public class CM_ACTION_USE extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
action = Action.fromID(buffer.readInt());
ctrlPressed = (buffer.readByte() == 1 ? true : false);
shiftPressed = (buffer.readByte() == 1 ? true : false);
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
final L2Character character = conn.getCharacter();
switch (action) {
case SIT_STAND:

6
src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java
View File

@@ -19,7 +19,7 @@ package com.l2jserver.game.net.packet.client;
import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.service.game.admin.AdministratorService;
import com.l2jserver.util.BufferUtils;
@@ -52,12 +52,12 @@ public class CM_ADMIN_COMMAND extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
command = BufferUtils.readString(buffer).trim();
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
// final StringTokenizer tokenizer = new StringTokenizer(command, " ");
// final String cmd = tokenizer.nextToken();
// if (cmd.equals("tele")) {

6
src/main/java/com/l2jserver/game/net/packet/client/CM_ATTACK.java
View File

@@ -21,7 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_ACTION_FAILED;
import com.l2jserver.model.id.ObjectID;
@@ -108,7 +108,7 @@ public class CM_ATTACK extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
this.objectId = buffer.readInt();
this.origin = Coordinate.fromXYZ(buffer.readInt(), buffer.readInt(),
buffer.readInt());
@@ -116,7 +116,7 @@ public class CM_ATTACK extends AbstractClientPacket {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
final L2Character character = conn.getCharacter();
// since this is an erasure type, this is safe.
final ObjectID<Actor> id = idResolver.resolve(objectId);

6
src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java
View File

@@ -22,7 +22,7 @@ import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.Lineage2Session;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_LIST;
@@ -71,7 +71,7 @@ public class CM_AUTH_LOGIN extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
this.loginName = BufferUtils.readString(buffer).toLowerCase();
this.playKey1 = buffer.readInt();
this.playKey2 = buffer.readInt();
@@ -80,7 +80,7 @@ public class CM_AUTH_LOGIN extends AbstractClientPacket {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
final AccountID accountId = accountIdFactory.createID(loginName);
conn.setSession(new Lineage2Session(accountId, playKey1, playKey2,
loginKey1, loginKey2));

6
src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java
View File

@@ -23,7 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.model.id.ObjectID;
import com.l2jserver.model.id.object.NPCID;
@@ -69,12 +69,12 @@ public class CM_BYPASS extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
this.command = BufferUtils.readString(buffer);
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
// parse command
final StringTokenizer tokenizer = new StringTokenizer(command, "_ ");
final String type = tokenizer.nextToken();

6
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java
View File

@@ -19,7 +19,7 @@ package com.l2jserver.game.net.packet.client;
import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.model.id.ObjectID;
import com.l2jserver.model.id.object.NPCID;
@@ -78,7 +78,7 @@ public class CM_CHAR_ACTION extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
this.objectId = buffer.readInt();
this.origin = Coordinate.fromXYZ(buffer.readInt(), buffer.readInt(),
buffer.readInt());
@@ -86,7 +86,7 @@ public class CM_CHAR_ACTION extends AbstractClientPacket {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
// since this is an erasure type, this is safe.
final ObjectID<NPC> id = idResolver.resolve(objectId);
if (!(id instanceof NPCID)) {

6
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java
View File

@@ -19,7 +19,7 @@ package com.l2jserver.game.net.packet.client;
import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.service.game.spawn.CharacterNotTeleportingServiceException;
import com.l2jserver.service.game.spawn.SpawnService;
@@ -47,11 +47,11 @@ public class CM_CHAR_APPEARING extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
try {
spawnService.finishTeleport(conn.getCharacter());
} catch (CharacterNotTeleportingServiceException e) {

6
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java
View File

@@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_FAIL;
import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_OK;
@@ -144,7 +144,7 @@ public class CM_CHAR_CREATE extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
name = BufferUtils.readString(buffer);
race = CharacterRace.fromOption(buffer.readInt());
sex = ActorSex.fromOption(buffer.readInt());
@@ -163,7 +163,7 @@ public class CM_CHAR_CREATE extends AbstractClientPacket {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
log.debug("Creating a new character, race={}, sex={}, class={}",
new Object[] { race, sex, characterClass });
if ((name.length() < 1) || (name.length() > 16)) {

6
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java
View File

@@ -21,7 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_STOP;
import com.l2jserver.model.world.L2Character;
@@ -76,7 +76,7 @@ public class CM_CHAR_MOVE extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
this.target = Coordinate.fromXYZ(buffer.readInt(), buffer.readInt(),
buffer.readInt());
this.origin = Coordinate.fromXYZ(buffer.readInt(), buffer.readInt(),
@@ -89,7 +89,7 @@ public class CM_CHAR_MOVE extends AbstractClientPacket {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
if (target.equals(origin)) {
log.debug("Target is same as origin. Stopping character.");
conn.write(new SM_STOP(conn.getCharacter()));

6
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.client;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_OPEN_MAP;
@@ -34,11 +34,11 @@ public class CM_CHAR_OPEN_MAP extends AbstractClientPacket {
public static final int OPCODE = 0x6c;
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
conn.write(new SM_CHAR_OPEN_MAP(1665));
}
}

6
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java
View File

@@ -19,7 +19,7 @@ package com.l2jserver.game.net.packet.client;
import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.service.game.character.CharacterService;
import com.l2jserver.util.geometry.Point3D;
@@ -50,14 +50,14 @@ public class CM_CHAR_POSITION extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
point = Point3D.fromXYZA(buffer.readInt(), buffer.readInt(),
buffer.readInt(), buffer.readInt());
extra = buffer.readInt();
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
charService.receivedValidation(conn.getCharacter(), point);
}
}

6
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.client;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_INVENTORY;
import com.l2jserver.model.world.L2Character;
@@ -36,11 +36,11 @@ public class CM_CHAR_REQ_INVENTORY extends AbstractClientPacket {
public static final int OPCODE = 0x14;
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
final L2Character character = conn.getCharacter();
conn.write(new SM_CHAR_INVENTORY(character.getInventory()));
}

6
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java
View File

@@ -22,7 +22,7 @@ import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_SELECTED;
import com.l2jserver.model.world.L2Character;
@@ -56,12 +56,12 @@ public class CM_CHAR_SELECT extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
slot = buffer.readInt();
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
final List<L2Character> chars = characterDao.selectByAccount(conn
.getSession().getAccountID());

6
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java
View File

@@ -19,7 +19,7 @@ package com.l2jserver.game.net.packet.client;
import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.SystemMessage;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_ACTION_FAILED;
@@ -60,7 +60,7 @@ public class CM_CHAT extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
this.message = BufferUtils.readString(buffer);
this.destination = ChatMessageDestination.fromID(buffer.readInt());
if (this.destination == ChatMessageDestination.TELL) { // private
@@ -70,7 +70,7 @@ public class CM_CHAT extends AbstractClientPacket {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
if (message.length() == 0 || destination == null) {
conn.write(SM_ACTION_FAILED.SHARED_INSTANCE);
conn.close();

6
src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java
View File

@@ -21,7 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.service.game.character.CharacterService;
@@ -53,7 +53,7 @@ public class CM_ENTER_WORLD extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
buffer.readBytes(new byte[32]); // Unknown Byte Array
buffer.readInt(); // Unknown Value
buffer.readInt(); // Unknown Value
@@ -68,7 +68,7 @@ public class CM_ENTER_WORLD extends AbstractClientPacket {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
final CharacterID id = conn.getCharacterID();
if (id == null) {
log.warn(

6
src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_ALL_FORTRESS_INFO.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.client;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_FORT_INFO;
@@ -38,11 +38,11 @@ public class CM_EXT_REQ_ALL_FORTRESS_INFO extends AbstractClientPacket {
public static final int OPCODE2 = 0x3d;
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
conn.write(new SM_FORT_INFO());
}
}

6
src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_KEY_MAPPING.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.client;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
/**
@@ -37,11 +37,11 @@ public class CM_EXT_REQ_KEY_MAPPING extends AbstractClientPacket {
public static final int OPCODE2 = 0x21;
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
// TODO
}
}

6
src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.client;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_MANOR_LIST;
@@ -38,11 +38,11 @@ public class CM_EXT_REQ_MANOR_LIST extends AbstractClientPacket {
public static final int OPCODE2 = 0x01;
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
conn.write(new SM_MANOR_LIST("gludio", "dion", "giran", "oren",
"aden", "innadril", "goddard", "rune", "schuttgart"));
}

6
src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_SHORTCUT_REGISTRY.java
View File

@@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
/**
@@ -65,11 +65,11 @@ public class CM_EXT_REQ_SHORTCUT_REGISTRY extends AbstractClientPacket {
private int characterType;
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
log.debug("Logging out client {}", conn);
conn.close();
}

6
src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java
View File

@@ -21,7 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.service.network.gameguard.GameGuardService;
@@ -58,7 +58,7 @@ public class CM_GG_KEY extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
byte[] part1 = buffer.readBytes(4).array();
buffer.readInt();
byte[] part2 = buffer.readBytes(4).array();
@@ -69,7 +69,7 @@ public class CM_GG_KEY extends AbstractClientPacket {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
log.debug("Received GG key");
switch (ggService.key(conn, key)) {
case INVALID:

6
src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java
View File

@@ -22,7 +22,7 @@ import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_LIST;
import com.l2jserver.model.world.L2Character;
@@ -54,11 +54,11 @@ public class CM_GOTO_LOBBY extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
final List<L2Character> chars = characterDao.selectByAccount(conn
.getSession().getAccountID());
conn.write(SM_CHAR_LIST.fromL2Session(

6
src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java
View File

@@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
/**
@@ -42,11 +42,11 @@ public class CM_LOGOUT extends AbstractClientPacket {
.getLogger(CM_LOGOUT.class);
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
log.debug("Logging out client {}", conn);
conn.close();
}

6
src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java
View File

@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.l2jserver.L2JConstant;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.Lineage2CryptographyKey;
import com.l2jserver.game.net.ProtocolVersion;
import com.l2jserver.game.net.packet.AbstractClientPacket;
@@ -70,13 +70,13 @@ public class CM_PROTOCOL_VERSION extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
this.version = ProtocolVersion.fromVersion((int) buffer
.readUnsignedInt());
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
// generate a new key
final Lineage2CryptographyKey inKey = new Lineage2CryptographyKey(
keygen.generate());

6
src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java
View File

@@ -21,7 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_TEMPLATE;
import com.l2jserver.model.id.template.CharacterTemplateID;
@@ -70,11 +70,11 @@ public class CM_REQUEST_CHAR_TEMPLATE extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
log.debug("Requested character templates");
final CharacterTemplate[] templates = new CharacterTemplate[TEMPLATE_CLASSES.length];

6
src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java
View File

@@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_CHAR_LIST;
import com.l2jserver.game.net.packet.server.SM_CHAR_RESTART;
@@ -55,11 +55,11 @@ public class CM_RESTART extends AbstractClientPacket {
}
@Override
public void read(Lineage2Connection conn, ChannelBuffer buffer) {
public void read(Lineage2Client conn, ChannelBuffer buffer) {
}
@Override
public void process(final Lineage2Connection conn) {
public void process(final Lineage2Client conn) {
try {
charService.leaveWorld(conn.getCharacter());
} catch (NotSpawnedServiceException e) {

4
src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
/**
@@ -45,6 +45,6 @@ public class SM_ACTION_FAILED extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
}
}

4
src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.Actor;
@@ -45,7 +45,7 @@ public class SM_ACTOR_POSITION extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(actor.getID().getID());
buffer.writeInt(actor.getPoint().getX());
buffer.writeInt(actor.getPoint().getY());

4
src/main/java/com/l2jserver/game/net/packet/server/SM_ATTACK.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.server.AttackHit;
import com.l2jserver.model.world.Actor;
@@ -59,7 +59,7 @@ public class SM_ATTACK extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(attacker.getID().getID());
final AttackHit first = hits.get(0);

4
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
/**
@@ -94,7 +94,7 @@ public class SM_CHAR_CREATE_FAIL extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(reason.id);
}
}

4
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
/**
@@ -42,7 +42,7 @@ public class SM_CHAR_CREATE_OK extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(0x01);
}
}

4
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java
View File

@@ -44,7 +44,7 @@ import static com.l2jserver.model.world.character.CharacterInventory.InventoryPa
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.template.actor.ActorSex;
import com.l2jserver.model.world.Item;
@@ -82,7 +82,7 @@ public class SM_CHAR_INFO extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(character.getPoint().getX());
buffer.writeInt(character.getPoint().getY());
buffer.writeInt(character.getPoint().getZ());

4
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java
View File

@@ -39,7 +39,7 @@ import static com.l2jserver.model.world.character.CharacterInventory.InventoryPa
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.template.actor.ActorSex;
import com.l2jserver.model.world.Item;
@@ -67,7 +67,7 @@ public class SM_CHAR_INFO_BROADCAST extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(character.getPoint().getX());
buffer.writeInt(character.getPoint().getY());
buffer.writeInt(character.getPoint().getZ());

4
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.L2Character;
@@ -44,7 +44,7 @@ public class SM_CHAR_INFO_EXTRA extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeShort(0xcf); // opcode2
buffer.writeInt(character.getID().getID()); // object ID of Player
buffer.writeInt(0x00); // event effect id

4
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.Item;
import com.l2jserver.model.world.character.CharacterInventory;
@@ -50,7 +50,7 @@ public class SM_CHAR_INVENTORY extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeShort((showWindow ? 0x01 : 0x00));
// TODO warehouse items will have an issue here!
buffer.writeShort(inventory.getItemCount()); // item count

4
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java
View File

@@ -46,7 +46,7 @@ import java.util.Collection;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.Lineage2Session;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.Item;
@@ -101,7 +101,7 @@ public class SM_CHAR_LIST extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
// buffer.writeByte(0x09);
buffer.writeInt(characters.length);

4
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
/**
@@ -43,7 +43,7 @@ public class SM_CHAR_OPEN_MAP extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(mapID);
buffer.writeByte(0x00); // seven signs period
}

4
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
/**
@@ -51,7 +51,7 @@ public class SM_CHAR_RESTART extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeByte((state ? 0x01 : 0x00));
}
}

4
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.model.world.actor.ActorExperience;
@@ -47,7 +47,7 @@ public class SM_CHAR_SELECTED extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
BufferUtils.writeString(buffer, character.getName());
buffer.writeInt(character.getID().getID());
BufferUtils.writeString(buffer, "It works!"); // title

4
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.template.CharacterTemplate;
@@ -44,7 +44,7 @@ public class SM_CHAR_TEMPLATE extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(templates.length);
for (final CharacterTemplate template : templates) {
buffer.writeInt(template.getRace().id);

4
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.Actor;
import com.l2jserver.model.world.L2Character;
@@ -71,7 +71,7 @@ public class SM_CHAT extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(actor.getID().getID());
buffer.writeInt(destination.id);
if (actor instanceof L2Character) {

4
src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java
View File

@@ -19,7 +19,7 @@ package com.l2jserver.game.net.packet.server;
import org.htmlparser.tags.Html;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.util.BufferUtils;
import com.l2jserver.util.html.markup.HtmlTemplate;
@@ -57,7 +57,7 @@ public class SM_COMMUNITY_HTML extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeByte(0x01); // display or hide
BufferUtils.writeString(buffer, html);
}

4
src/main/java/com/l2jserver/game/net/packet/server/SM_DIE.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.server.AttackHit;
import com.l2jserver.model.world.Actor;
@@ -46,7 +46,7 @@ public class SM_DIE extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(actor.getID().getID());
buffer.writeInt(0x00); // to hide away
buffer.writeInt(0x00); // to castle

4
src/main/java/com/l2jserver/game/net/packet/server/SM_ENTER_WORLD.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.model.world.actor.ActorExperience;
@@ -59,7 +59,7 @@ public class SM_ENTER_WORLD extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
BufferUtils.writeString(buffer, character.getName());
buffer.writeInt(character.getID().getID());
BufferUtils.writeString(buffer, "Hello world!");

4
src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.util.BufferUtils;
@@ -38,7 +38,7 @@ public class SM_FORT_INFO extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeShort(0x15);
buffer.writeInt(21);
int i = 101;

4
src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
/**
@@ -39,7 +39,7 @@ public class SM_GG_QUERY extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(0x27533DD9);
buffer.writeInt(0x2E72A51D);
buffer.writeInt(0x2017038B);

4
src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java
View File

@@ -19,7 +19,7 @@ package com.l2jserver.game.net.packet.server;
import org.htmlparser.tags.Html;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.NPC;
import com.l2jserver.util.BufferUtils;
@@ -64,7 +64,7 @@ public class SM_HTML extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt((npc != null ? npc.getID().getID() : 0x01));
BufferUtils.writeString(buffer, html);
buffer.writeInt(0x00); // item id

4
src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
/**
@@ -37,7 +37,7 @@ public class SM_ITEM_GROUND extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(268437456); // char who dropped
buffer.writeInt(268635461); // item obj id
buffer.writeInt(57); // item template id

4
src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java
View File

@@ -20,7 +20,7 @@ import java.util.Arrays;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.Lineage2CryptographyKey;
import com.l2jserver.game.net.packet.AbstractServerPacket;
@@ -78,7 +78,7 @@ public class SM_KEY extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeByte((status ? 0x01 : 0x00));
for (int i = 0; i < 8; i++) {
buffer.writeByte(key[i]);

4
src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.util.BufferUtils;
@@ -44,7 +44,7 @@ public class SM_MANOR_LIST extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeShort(0x22);
buffer.writeInt(manors.length);
int i = 1;

4
src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.Actor;
import com.l2jserver.util.geometry.Coordinate;
@@ -52,7 +52,7 @@ public class SM_MOVE extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(actor.getID().getID());
// target

4
src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE_TYPE.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.L2Character;
@@ -44,7 +44,7 @@ public class SM_MOVE_TYPE extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(character.getID().getID());
buffer.writeInt(character.getMoveType().id);
buffer.writeInt(0x00); // unk

4
src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.model.world.NPC;
@@ -43,7 +43,7 @@ public class SM_NPC_INFO extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
final NPCTemplate template = npc.getTemplate();
buffer.writeInt(npc.getID().getID());

4
src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.PositionableObject;
@@ -45,7 +45,7 @@ public class SM_OBJECT_REMOVE extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(object.getID().getID());
buffer.writeInt(0x00);
}

4
src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.model.world.NPC;
@@ -44,7 +44,7 @@ public class SM_SERVER_OBJECT extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
final NPCTemplate template = npc.getTemplate();
buffer.writeInt(npc.getID().getID()); // obj id

4
src/main/java/com/l2jserver/game/net/packet/server/SM_STATUS_UPDATE.java
View File

@@ -21,7 +21,7 @@ import java.util.Map.Entry;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.Actor;
import com.l2jserver.util.factory.CollectionFactory;
@@ -73,7 +73,7 @@ public class SM_STATUS_UPDATE extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(actor.getID().getID());
buffer.writeInt(update.size());

4
src/main/java/com/l2jserver/game/net/packet/server/SM_STOP.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.L2Character;
@@ -41,7 +41,7 @@ public class SM_STOP extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(character.getID().getID());
buffer.writeInt(character.getPoint().getX());
buffer.writeInt(character.getPoint().getY());

26
src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java
View File

@@ -20,7 +20,7 @@ import java.util.List;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.SystemMessage;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.game.Fort;
@@ -70,7 +70,7 @@ public class SM_SYSTEM_MESSAGE extends AbstractServerPacket {
public static final byte TYPE_NUMBER = 1;
public static final byte TYPE_TEXT = 0;
void write(Lineage2Connection conn, ChannelBuffer buffer);
void write(Lineage2Client conn, ChannelBuffer buffer);
}
/**
@@ -82,7 +82,7 @@ public class SM_SYSTEM_MESSAGE extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(id);
buffer.writeInt(params.size());
for (final SystemMessagePacketParameter param : params) {
@@ -93,7 +93,7 @@ public class SM_SYSTEM_MESSAGE extends AbstractServerPacket {
public final SM_SYSTEM_MESSAGE addString(final String text) {
params.add(new SystemMessagePacketParameter() {
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(TYPE_TEXT);
BufferUtils.writeString(buffer, text);
}
@@ -114,7 +114,7 @@ public class SM_SYSTEM_MESSAGE extends AbstractServerPacket {
public final SM_SYSTEM_MESSAGE addFort(final Fort fort) {
params.add(new SystemMessagePacketParameter() {
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(TYPE_CASTLE_NAME);
buffer.writeInt(fort.getID().getID());
}
@@ -125,7 +125,7 @@ public class SM_SYSTEM_MESSAGE extends AbstractServerPacket {
public final SM_SYSTEM_MESSAGE addNumber(final int number) {
params.add(new SystemMessagePacketParameter() {
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(TYPE_NUMBER);
buffer.writeInt(number);
}
@@ -136,7 +136,7 @@ public class SM_SYSTEM_MESSAGE extends AbstractServerPacket {
public final SM_SYSTEM_MESSAGE addItemCount(final long number) {
params.add(new SystemMessagePacketParameter() {
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(TYPE_ITEM_NUMBER);
buffer.writeLong(number);
}
@@ -159,7 +159,7 @@ public class SM_SYSTEM_MESSAGE extends AbstractServerPacket {
public final SM_SYSTEM_MESSAGE addItem(final ItemTemplate item) {
params.add(new SystemMessagePacketParameter() {
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(TYPE_ITEM_NAME);
buffer.writeInt(item.getID().getID());
}
@@ -175,7 +175,7 @@ public class SM_SYSTEM_MESSAGE extends AbstractServerPacket {
final int z) {
params.add(new SystemMessagePacketParameter() {
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(TYPE_ZONE_NAME);
buffer.writeInt(x);
buffer.writeInt(y);
@@ -189,7 +189,7 @@ public class SM_SYSTEM_MESSAGE extends AbstractServerPacket {
final int level) {
params.add(new SystemMessagePacketParameter() {
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(TYPE_SKILL_NAME);
buffer.writeInt(skill.getID().getID());
buffer.writeInt(level);
@@ -211,7 +211,7 @@ public class SM_SYSTEM_MESSAGE extends AbstractServerPacket {
public final SM_SYSTEM_MESSAGE addElemntal(final int type) {
params.add(new SystemMessagePacketParameter() {
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(TYPE_ELEMENT_NAME);
buffer.writeInt(type);
}
@@ -228,7 +228,7 @@ public class SM_SYSTEM_MESSAGE extends AbstractServerPacket {
public final SM_SYSTEM_MESSAGE addSystemString(final int type) {
params.add(new SystemMessagePacketParameter() {
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(TYPE_SYSTEM_STRING);
buffer.writeInt(type);
}
@@ -246,7 +246,7 @@ public class SM_SYSTEM_MESSAGE extends AbstractServerPacket {
public final SM_SYSTEM_MESSAGE addInstanceName(final int type) {
params.add(new SystemMessagePacketParameter() {
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(TYPE_INSTANCE_NAME);
buffer.writeInt(type);
}

4
src/main/java/com/l2jserver/game/net/packet/server/SM_TARGET.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.Actor;
@@ -51,7 +51,7 @@ public class SM_TARGET extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(object.getID().getID());
buffer.writeShort(color);
buffer.writeInt(0x00);

4
src/main/java/com/l2jserver/game/net/packet/server/SM_TELEPORT.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.game.net.packet.server;
import org.jboss.netty.buffer.ChannelBuffer;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractServerPacket;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.util.geometry.Point3D;
@@ -51,7 +51,7 @@ public class SM_TELEPORT extends AbstractServerPacket {
}
@Override
public void write(Lineage2Connection conn, ChannelBuffer buffer) {
public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt(character.getID().getID());
buffer.writeInt(point.getX());
buffer.writeInt(point.getY());

6
src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java
View File

@@ -21,7 +21,7 @@ import java.util.Arrays;
import org.htmlparser.Parser;
import org.htmlparser.util.ParserException;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.server.SM_HTML;
import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.model.world.L2Character;
@@ -39,7 +39,7 @@ import com.l2jserver.util.html.markup.MarkupTag;
*/
public class BaseNPCController implements NPCController {
@Override
public void action(NPC npc, Lineage2Connection conn, L2Character character,
public void action(NPC npc, Lineage2Client conn, L2Character character,
final String... args) throws L2Exception {
if (args.length == 2) {
if (args[0].equals("Chat")) {
@@ -80,7 +80,7 @@ public class BaseNPCController implements NPCController {
* @return true if chat message was sent
* @throws L2Exception
*/
protected boolean talk(NPC npc, Lineage2Connection conn,
protected boolean talk(NPC npc, Lineage2Client conn,
L2Character character, String... args) throws L2Exception {
String id = null;
if (args.length >= 1) {

4
src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java
View File

@@ -17,7 +17,7 @@
package com.l2jserver.model.world.npc.controller;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.server.SM_STATUS_UPDATE;
import com.l2jserver.game.net.packet.server.SM_STATUS_UPDATE.Stat;
import com.l2jserver.model.world.L2Character;
@@ -44,7 +44,7 @@ public class MonsterController extends BaseNPCController {
protected NPCService npcService;
@Override
public void action(NPC mob, Lineage2Connection conn, L2Character character,
public void action(NPC mob, Lineage2Client conn, L2Character character,
String... args) throws L2Exception {
// send hp update
if (mob.getID().equals(character.getTargetID())) {

4
src/main/java/com/l2jserver/model/world/npc/controller/NPCController.java
View File

@@ -16,7 +16,7 @@
*/
package com.l2jserver.model.world.npc.controller;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.model.world.NPC;
import com.l2jserver.util.exception.L2Exception;
@@ -42,6 +42,6 @@ public interface NPCController {
* @throws L2Exception
* any {@link L2Exception}
*/
void action(NPC npc, Lineage2Connection conn, L2Character character,
void action(NPC npc, Lineage2Client conn, L2Character character,
String... args) throws L2Exception;
}

4
src/main/java/com/l2jserver/model/world/npc/controller/NotImplementedNPCController.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.model.world.npc.controller;
import java.util.Arrays;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.server.SM_HTML;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.model.world.NPC;
@@ -34,7 +34,7 @@ import com.l2jserver.util.html.markup.MarkupTag;
*/
public class NotImplementedNPCController extends BaseNPCController {
@Override
public void action(NPC npc, Lineage2Connection conn, L2Character character,
public void action(NPC npc, Lineage2Client conn, L2Character character,
final String... args) throws L2Exception {
// action not handled
final HtmlTemplate template = new HtmlTemplate() {

4
src/main/java/com/l2jserver/model/world/npc/controller/TeleporterController.java
View File

@@ -17,7 +17,7 @@
package com.l2jserver.model.world.npc.controller;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.model.id.template.provider.TeleportationTemplateIDProvider;
import com.l2jserver.model.template.TeleportationTemplate;
import com.l2jserver.model.world.L2Character;
@@ -40,7 +40,7 @@ public class TeleporterController extends BaseNPCController {
protected TeleportationTemplateIDProvider teleportationIdProvider;
@Override
public void action(NPC npc, Lineage2Connection conn, L2Character character,
public void action(NPC npc, Lineage2Client conn, L2Character character,
String... args) throws L2Exception {
if (args.length >= 2) {
if (args[0].equals("goto")) {

5
src/main/java/com/l2jserver/service/cache/EternalCache.java vendored
View File

@@ -25,7 +25,8 @@ import org.slf4j.LoggerFactory;
import com.l2jserver.util.factory.CollectionFactory;
/**
* Cache class for an eternal cache
* Cache class for an eternal cache. Entries in this cache instance won't ever
* be automatically removed, even if the JVM is running out of memory.
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*
@@ -34,7 +35,7 @@ import com.l2jserver.util.factory.CollectionFactory;
* @param <V>
* the value type
*/
class EternalCache<K, V> implements Cache<K, V> {
public class EternalCache<K, V> implements Cache<K, V> {
protected final Logger log = LoggerFactory.getLogger(this.getClass());
/**

3
src/main/java/com/l2jserver/service/core/threading/ThreadServiceImpl.java
View File

@@ -45,6 +45,9 @@ public class ThreadServiceImpl extends AbstractService implements ThreadService
*/
private final Logger log = LoggerFactory.getLogger(this.getClass());
/**
* The public shared thread pool
*/
private ThreadPool pool;
@Override

4
src/main/java/com/l2jserver/service/game/admin/AdministratorService.java
View File

@@ -16,7 +16,7 @@
*/
package com.l2jserver.service.game.admin;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.service.Service;
@@ -38,7 +38,7 @@ public interface AdministratorService extends Service {
* @param args
* the arguments
*/
void command(Lineage2Connection conn, L2Character character,
void command(Lineage2Client conn, L2Character character,
String command, String... args);
/**

4
src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.service.game.admin;
import java.util.List;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.server.SM_HTML;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.model.world.L2Character;
@@ -35,7 +35,7 @@ public class AdministratorServiceImpl extends AbstractService implements
private List<CharacterID> online;
@Override
public void command(Lineage2Connection conn, L2Character character,
public void command(Lineage2Client conn, L2Character character,
String command, String... args) {
conn.write(new SM_HTML(null, new AdminHomeTemplate()));
}

14
src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java
View File

@@ -19,7 +19,7 @@ package com.l2jserver.service.game.character;
import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.SystemMessage;
import com.l2jserver.game.net.packet.server.SM_CHAR_INFO;
import com.l2jserver.game.net.packet.server.SM_CHAR_INFO_EXTRA;
@@ -134,7 +134,7 @@ public class CharacterServiceImpl extends AbstractService implements
AlreadySpawnedServiceException {
Preconditions.checkNotNull(character, "character");
final CharacterID id = character.getID();
final Lineage2Connection conn = networkService.discover(id);
final Lineage2Client conn = networkService.discover(id);
if (conn == null)
return;
@@ -240,7 +240,7 @@ public class CharacterServiceImpl extends AbstractService implements
Preconditions.checkNotNull(character, "character");
Preconditions.checkNotNull(target, "target");
final CharacterID id = character.getID();
final Lineage2Connection conn = networkService.discover(id);
final Lineage2Client conn = networkService.discover(id);
if (target == null && character.getTargetID() != null) {
// if is trying to select null (remove target) and the character has
@@ -281,7 +281,7 @@ public class CharacterServiceImpl extends AbstractService implements
Preconditions.checkNotNull(character, "character");
Preconditions.checkNotNull(target, "target");
final CharacterID id = character.getID();
final Lineage2Connection conn = networkService.discover(id);
final Lineage2Client conn = networkService.discover(id);
// check if this Actor can be attacked
if (target instanceof NPC) {
final NPC npc = (NPC) target;
@@ -321,7 +321,7 @@ public class CharacterServiceImpl extends AbstractService implements
Preconditions.checkNotNull(character, "character");
Preconditions.checkNotNull(coordinate, "coordinate");
final CharacterID id = character.getID();
final Lineage2Connection conn = networkService.discover(id);
final Lineage2Client conn = networkService.discover(id);
// we don't set the character coordinate here, this will be done by
// validation packets, sent by client
@@ -368,7 +368,7 @@ public class CharacterServiceImpl extends AbstractService implements
throws CharacterAlreadyWalkingServiceException {
Preconditions.checkNotNull(character, "character");
final CharacterID id = character.getID();
final Lineage2Connection conn = networkService.discover(id);
final Lineage2Client conn = networkService.discover(id);
// test if character is running
if (character.getMoveType() == CharacterMoveType.WALK)
throw new CharacterAlreadyWalkingServiceException();
@@ -384,7 +384,7 @@ public class CharacterServiceImpl extends AbstractService implements
throws CharacterAlreadyRunningServiceException {
Preconditions.checkNotNull(character, "character");
final CharacterID id = character.getID();
final Lineage2Connection conn = networkService.discover(id);
final Lineage2Client conn = networkService.discover(id);
// test if character is walking
if (character.getMoveType() == CharacterMoveType.RUN)
throw new CharacterAlreadyRunningServiceException();

6
src/main/java/com/l2jserver/service/game/npc/NPCService.java
View File

@@ -16,7 +16,7 @@
*/
package com.l2jserver.service.game.npc;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION.CharacterAction;
import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.model.world.Actor;
@@ -93,12 +93,12 @@ public interface NPCService extends Service {
* @param npc
* the npc
* @param conn
* the {@link Lineage2Connection} object
* the {@link Lineage2Client} object
* @param attacker
* the character
* @throws NotAttackableNPCServiceException
* if {@link NPC} is not attackable
*/
void attack(NPC npc, Lineage2Connection conn, L2Character attacker)
void attack(NPC npc, Lineage2Client conn, L2Character attacker)
throws NotAttackableNPCServiceException;
}

10
src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java
View File

@@ -25,7 +25,7 @@ import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.l2jserver.db.dao.NPCDAO;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION.CharacterAction;
import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.model.world.Actor;
@@ -66,7 +66,7 @@ public class NPCServiceImpl extends AbstractService implements NPCService {
*/
private final SpawnService spawnService;
/**
* The {@link NetworkService} used to discover {@link Lineage2Connection}
* The {@link NetworkService} used to discover {@link Lineage2Client}
*/
private final NetworkService networkService;
/**
@@ -142,7 +142,7 @@ public class NPCServiceImpl extends AbstractService implements NPCService {
Preconditions.checkNotNull(character, "character");
Preconditions.checkNotNull(action, "action");
final Lineage2Connection conn = networkService.discover(character
final Lineage2Client conn = networkService.discover(character
.getID());
try {
final NPCController controller = getController(npc);
@@ -160,7 +160,7 @@ public class NPCServiceImpl extends AbstractService implements NPCService {
if (args == null)
args = new String[0];
final Lineage2Connection conn = networkService.discover(character
final Lineage2Client conn = networkService.discover(character
.getID());
try {
final NPCController controller = getController(npc);
@@ -215,7 +215,7 @@ public class NPCServiceImpl extends AbstractService implements NPCService {
}
@Override
public void attack(NPC npc, Lineage2Connection conn, L2Character attacker)
public void attack(NPC npc, Lineage2Client conn, L2Character attacker)
throws NotAttackableNPCServiceException {
Preconditions.checkNotNull(npc, "npc");
Preconditions.checkNotNull(conn, "conn");

4
src/main/java/com/l2jserver/service/game/spawn/SpawnPointNotFoundServiceException.java
View File

@@ -16,13 +16,11 @@
*/
package com.l2jserver.service.game.spawn;
/**
* Exception thrown when the target spawn point is not found
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class SpawnPointNotFoundServiceException extends
SpawnServiceException {
public class SpawnPointNotFoundServiceException extends SpawnServiceException {
private static final long serialVersionUID = 1L;
}

4
src/main/java/com/l2jserver/service/game/spawn/SpawnService.java
View File

@@ -72,7 +72,7 @@ public interface SpawnService extends Service {
* the unit of <tt>time</tt>
* @return an future that can be used to obtain spawn exceptions
*/
AsyncFuture<?> spawn(PositionableObject object, Point3D point, long time,
<T extends PositionableObject> AsyncFuture<T> spawn(T object, Point3D point, long time,
TimeUnit unit);
/**
@@ -97,7 +97,7 @@ public interface SpawnService extends Service {
* the unit of <tt>time</tt>
* @return an future that can be used to obtain spawn exceptions
*/
AsyncFuture<?> unspawn(PositionableObject object, long time, TimeUnit unit);
<T extends PositionableObject> AsyncFuture<T> unspawn(T object, long time, TimeUnit unit);
/**
* Teleports the object to the given <tt>point</tt>.

18
src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java
View File

@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.server.SM_CHAR_INFO;
import com.l2jserver.game.net.packet.server.SM_CHAR_INFO_EXTRA;
import com.l2jserver.game.net.packet.server.SM_TELEPORT;
@@ -130,15 +130,15 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService {
}
@Override
public AsyncFuture<?> spawn(final PositionableObject object,
public <T extends PositionableObject> AsyncFuture<T> spawn(final T object,
final Point3D point, long time, TimeUnit unit) {
Preconditions.checkNotNull(object, "object");
Preconditions.checkArgument(time > 0, "time < 0");
Preconditions.checkNotNull(unit, "unit");
return threadService.async(time, unit,
new Callable<PositionableObject>() {
new Callable<T>() {
@Override
public PositionableObject call() throws Exception {
public T call() throws Exception {
spawn(object, point);
return object;
}
@@ -176,15 +176,15 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService {
}
@Override
public AsyncFuture<?> unspawn(final PositionableObject object, long time,
public <T extends PositionableObject> AsyncFuture<T> unspawn(final T object, long time,
TimeUnit unit) {
Preconditions.checkNotNull(object, "object");
Preconditions.checkArgument(time > 0, "time <= 0");
Preconditions.checkNotNull(unit, "unit");
return threadService.async(time, unit,
new Callable<PositionableObject>() {
new Callable<T>() {
@Override
public PositionableObject call() throws Exception {
public T call() throws Exception {
unspawn(object);
return object;
}
@@ -200,7 +200,7 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService {
if (((L2Character) player).isTeleporting())
throw new CharacterAlreadyTeleportingServiceException();
final Lineage2Connection conn = networkService
final Lineage2Client conn = networkService
.discover((CharacterID) player.getID());
if (conn == null)
// TODO throw an exception here
@@ -223,7 +223,7 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService {
throws CharacterNotTeleportingServiceException {
Preconditions.checkNotNull(character, "character");
final CharacterID id = character.getID();
final Lineage2Connection conn = networkService.discover(id);
final Lineage2Client conn = networkService.discover(id);
if (!character.isTeleporting())
throw new CharacterNotTeleportingServiceException();

12
src/main/java/com/l2jserver/service/network/NettyNetworkService.java
View File

@@ -30,7 +30,7 @@ import org.jboss.netty.logging.Slf4JLoggerFactory;
import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.Lineage2PipelineFactory;
import com.l2jserver.game.net.packet.ServerPacket;
import com.l2jserver.model.id.object.CharacterID;
@@ -76,7 +76,7 @@ public class NettyNetworkService extends AbstractService implements
/**
* The client list. This list all active clients in the server
*/
private Set<Lineage2Connection> clients = CollectionFactory.newSet();
private Set<Lineage2Client> clients = CollectionFactory.newSet();
@Inject
public NettyNetworkService(ConfigurationService configService,
@@ -98,7 +98,7 @@ public class NettyNetworkService extends AbstractService implements
}
@Override
public void register(final Lineage2Connection client) {
public void register(final Lineage2Client client) {
Preconditions.checkNotNull(client, "client");
clients.add(client);
client.getChannel().getCloseFuture()
@@ -112,15 +112,15 @@ public class NettyNetworkService extends AbstractService implements
}
@Override
public void unregister(Lineage2Connection client) {
public void unregister(Lineage2Client client) {
Preconditions.checkNotNull(client, "client");
clients.remove(client);
}
@Override
public Lineage2Connection discover(CharacterID character) {
public Lineage2Client discover(CharacterID character) {
Preconditions.checkNotNull(character, "character");
for (final Lineage2Connection client : clients) {
for (final Lineage2Client client : clients) {
if (character.equals(client.getCharacterID()))
return client;
}

8
src/main/java/com/l2jserver/service/network/NetworkService.java
View File

@@ -16,7 +16,7 @@
*/
package com.l2jserver.service.network;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.ServerPacket;
import com.l2jserver.model.id.object.CharacterID;
import com.l2jserver.service.Service;
@@ -34,7 +34,7 @@ public interface NetworkService extends Service {
* @param client
* the client
*/
void register(Lineage2Connection client);
void register(Lineage2Client client);
/**
* Unregisters a client
@@ -42,7 +42,7 @@ public interface NetworkService extends Service {
* @param client
* the client
*/
void unregister(Lineage2Connection client);
void unregister(Lineage2Client client);
/**
* Discover the client using <tt>character</tt>
@@ -51,7 +51,7 @@ public interface NetworkService extends Service {
* the character
* @return the found connection
*/
Lineage2Connection discover(CharacterID character);
Lineage2Client discover(CharacterID character);
/**
* Broadcast an given <tt>packet</tt> to all clients connected

10
src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java
View File

@@ -16,7 +16,7 @@
*/
package com.l2jserver.service.network.broadcast;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.model.world.WorldObject;
import com.l2jserver.service.Service;
@@ -27,5 +27,11 @@ import com.l2jserver.service.Service;
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public interface BroadcastService extends Service {
void broadcast(Lineage2Connection conn);
/**
* Broadcast all nearby objects to the given <tt>client</tt>
*
* @param conn
* the Lineage 2 client
*/
void broadcast(Lineage2Client conn);
}

10
src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.service.network.broadcast;
import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.SystemMessage;
import com.l2jserver.game.net.packet.server.SM_ATTACK;
import com.l2jserver.game.net.packet.server.SM_CHAR_INFO_BROADCAST;
@@ -72,7 +72,7 @@ public class BroadcastServiceImpl extends AbstractService implements
}
@Override
public void broadcast(final Lineage2Connection conn) {
public void broadcast(final Lineage2Client conn) {
Preconditions.checkNotNull(conn, "conn");
final L2Character character = conn.getCharacter();
Preconditions.checkNotNull(character, "character");
@@ -152,7 +152,7 @@ public class BroadcastServiceImpl extends AbstractService implements
* @param character
* the character
*/
private void broadcastAll(Lineage2Connection conn, L2Character character) {
private void broadcastAll(Lineage2Client conn, L2Character character) {
for (final WorldObject o : worldService.iterable(new KnownListFilter(
character))) {
broadcast(conn, o);
@@ -170,7 +170,7 @@ public class BroadcastServiceImpl extends AbstractService implements
* @param point
* the old point
*/
private void broadcastUpdate(Lineage2Connection conn,
private void broadcastUpdate(Lineage2Client conn,
L2Character character, Point3D point) {
for (final WorldObject o : worldService
.iterable(new KnownListUpdateFilter(character, point))) {
@@ -186,7 +186,7 @@ public class BroadcastServiceImpl extends AbstractService implements
* @param character
* the character
*/
private void broadcast(Lineage2Connection conn, WorldObject o) {
private void broadcast(Lineage2Client conn, WorldObject o) {
if (o instanceof NPC) {
conn.write(new SM_NPC_INFO((NPC) o));
} else if (o instanceof L2Character) {

6
src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java
View File

@@ -18,7 +18,7 @@ package com.l2jserver.service.network.gameguard;
import java.util.concurrent.Future;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.service.Service;
/**
@@ -34,7 +34,7 @@ public interface GameGuardService extends Service {
* the lineage 2 connection
* @return an future that will be used to obtain validation status
*/
Future<GameGuardResponse> query(Lineage2Connection conn);
Future<GameGuardResponse> query(Lineage2Client conn);
/**
* The Game guard key state
@@ -62,5 +62,5 @@ public interface GameGuardService extends Service {
* the key
* @return the validation state
*/
GameGuardResponse key(Lineage2Connection conn, byte[] key);
GameGuardResponse key(Lineage2Client conn, byte[] key);
}

10
src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java
View File

@@ -25,7 +25,7 @@ import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelFutureListener;
import com.google.common.util.concurrent.AbstractFuture;
import com.l2jserver.game.net.Lineage2Connection;
import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.server.SM_GG_QUERY;
import com.l2jserver.service.AbstractService;
import com.l2jserver.service.AbstractService.Depends;
@@ -54,7 +54,7 @@ public class GameGuardServiceImpl extends AbstractService implements
/**
* The map containing all pending futures
*/
private Map<Lineage2Connection, GGFuture> futures;
private Map<Lineage2Client, GGFuture> futures;
/**
* The {@link MessageDigest} for SHA-1.
* <p>
@@ -74,7 +74,7 @@ public class GameGuardServiceImpl extends AbstractService implements
}
@Override
public Future<GameGuardResponse> query(final Lineage2Connection conn) {
public Future<GameGuardResponse> query(final Lineage2Client conn) {
conn.write(new SM_GG_QUERY()).addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future)
@@ -90,7 +90,7 @@ public class GameGuardServiceImpl extends AbstractService implements
}
@Override
public GameGuardResponse key(Lineage2Connection conn, byte[] key) {
public GameGuardResponse key(Lineage2Client conn, byte[] key) {
final GGFuture future = futures.remove(conn);
final boolean validated = validate(conn, key);
final GameGuardResponse response = (validated ? GameGuardResponse.VALID
@@ -109,7 +109,7 @@ public class GameGuardServiceImpl extends AbstractService implements
* the key
* @return true if key is valid
*/
private boolean validate(Lineage2Connection conn, byte[] key) {
private boolean validate(Lineage2Client conn, byte[] key) {
// synchronized (digester) {
// return Arrays.equals(VALID_KEY_SHA1, digester.digest(key));
// }

83
src/main/java/com/l2jserver/test/XMLMappingTest.java
View File

@@ -1,83 +0,0 @@
/*
* This file is part of l2jserver <l2jserver.com>.
*
* l2jserver is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* l2jserver is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.test;
import java.io.File;
import java.io.IOException;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.l2jserver.GameServerModule;
import com.l2jserver.model.template.CharacterTemplate;
import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.model.template.TeleportationTemplate;
import com.l2jserver.service.game.admin.panel.AdminHomeTemplate;
import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter;
import com.l2jserver.util.jaxb.ItemTemplateIDAdapter;
import com.l2jserver.util.jaxb.NPCTemplateIDAdapter;
import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
/**
* @author <a href="http://www.rogiel.com">Rogiel</a>
*
*/
public class XMLMappingTest {
/**
* @param args
* @throws JAXBException
* @throws IOException
*/
public static void main(String[] args) throws JAXBException, IOException {
// final List<NPCTemplate> templates = CollectionFactory.newList();
System.out.println(new AdminHomeTemplate().toHtmlString());
System.exit(0);
final JAXBContext c = JAXBContext.newInstance(CharacterTemplate.class,
NPCTemplate.class, TeleportationTemplate.class);
final Unmarshaller u = c.createUnmarshaller();
final Injector injector = Guice.createInjector(new GameServerModule());
u.setAdapter(NPCTemplateIDAdapter.class,
injector.getInstance(NPCTemplateIDAdapter.class));
u.setAdapter(ItemTemplateIDAdapter.class,
injector.getInstance(ItemTemplateIDAdapter.class));
u.setAdapter(CharacterTemplateIDAdapter.class,
injector.getInstance(CharacterTemplateIDAdapter.class));
u.setAdapter(TeleportationTemplateIDAdapter.class,
injector.getInstance(TeleportationTemplateIDAdapter.class));
// long start = System.currentTimeMillis();
// for (int i = 0; i < 200 * 1000; i++) {
// final NPCTemplate t = (NPCTemplate) u.unmarshal(new File(
// "data/npc.xml"));
// templates.add(t);
// }
// long end = System.currentTimeMillis();
//
// System.out.println("Took " + ((end - start) / 1000) + " seconds");
final CharacterTemplate t = (CharacterTemplate) u.unmarshal(new File(
"data/templates/character/HumanFighter.xml"));
System.out.println(t.getID());
System.out.println(t.getBasePhysicalAttack());
}
}