Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-06 07:32:46 +00:00
Code Releases Activity

Reorganizes a few packets

Browse Source
This commit is contained in:
Rogiel Sulzbach
2011-12-18 22:37:11 -02:00
parent d24d7cc22b
commit 9e144ec9e1
6 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java
View File

@@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.Lineage2Client;
import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.AbstractClientPacket;
import com.l2jserver.game.net.packet.server.SM_STOP; import com.l2jserver.game.net.packet.server.SM_CHAR_STOP;
import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.L2Character;
import com.l2jserver.service.game.character.CharacterService; import com.l2jserver.service.game.character.CharacterService;
import com.l2jserver.util.geometry.Coordinate; import com.l2jserver.util.geometry.Coordinate;
@@ -95,7 +95,7 @@ public class CM_CHAR_MOVE extends AbstractClientPacket {
public void process(final Lineage2Client conn) { public void process(final Lineage2Client conn) {
if (target.equals(origin)) { if (target.equals(origin)) {
log.debug("Target is same as origin. Stopping character."); log.debug("Target is same as origin. Stopping character.");
conn.write(new SM_STOP(conn.getCharacter())); conn.write(new SM_CHAR_STOP(conn.getCharacter()));
return; return;
} }
if (target.getDistance(origin) >= 98010000) { if (target.getDistance(origin) >= 98010000) {

8
l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ATTACK.java → l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_ATTACK.java
View File

@@ -33,7 +33,7 @@ import com.l2jserver.util.factory.CollectionFactory;
* @author <a href="http://www.rogiel.com">Rogiel</a> * @author <a href="http://www.rogiel.com">Rogiel</a>
* @see AttackHit * @see AttackHit
*/ */
public class SM_ATTACK extends AbstractServerPacket { public class SM_ACTOR_ATTACK extends AbstractServerPacket {
/** /**
* The packet OPCODE * The packet OPCODE
*/ */
@@ -48,13 +48,13 @@ public class SM_ATTACK extends AbstractServerPacket {
*/ */
private final List<AttackHit> hits = CollectionFactory.newList(); private final List<AttackHit> hits = CollectionFactory.newList();
public SM_ATTACK(Actor attacker, AttackHit... hits) { public SM_ACTOR_ATTACK(Actor attacker, AttackHit... hits) {
super(OPCODE); super(OPCODE);
this.attacker = attacker; this.attacker = attacker;
Collections.addAll(this.hits, hits); Collections.addAll(this.hits, hits);
} }
public SM_ATTACK(AttackHit... hits) { public SM_ACTOR_ATTACK(AttackHit... hits) {
this(hits[0].getAttacker(), hits); this(hits[0].getAttacker(), hits);
} }
@@ -90,7 +90,7 @@ public class SM_ATTACK extends AbstractServerPacket {
buffer.writeInt(first.getTarget().getPoint().getZ()); buffer.writeInt(first.getTarget().getPoint().getZ());
} }
public SM_ATTACK add(AttackHit hit) { public SM_ACTOR_ATTACK add(AttackHit hit) {
hits.add(hit); hits.add(hit);
return this; return this;
} }

4
l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MOVE_TYPE.java → l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java
View File

@@ -27,7 +27,7 @@ import com.l2jserver.model.world.L2Character;
* *
* @author <a href="http://www.rogiel.com">Rogiel</a> * @author <a href="http://www.rogiel.com">Rogiel</a>
*/ */
public class SM_MOVE_TYPE extends AbstractServerPacket { public class SM_CHAR_MOVE_TYPE extends AbstractServerPacket {
/** /**
* The packet OPCODE * The packet OPCODE
*/ */
@@ -38,7 +38,7 @@ public class SM_MOVE_TYPE extends AbstractServerPacket {
*/ */
private final L2Character character; private final L2Character character;
public SM_MOVE_TYPE(L2Character character) { public SM_CHAR_MOVE_TYPE(L2Character character) {
super(OPCODE); super(OPCODE);
this.character = character; this.character = character;
} }

4
l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_STOP.java → l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java
View File

@@ -27,7 +27,7 @@ import com.l2jserver.model.world.L2Character;
* *
* @author <a href="http://www.rogiel.com">Rogiel</a> * @author <a href="http://www.rogiel.com">Rogiel</a>
*/ */
public class SM_STOP extends AbstractServerPacket { public class SM_CHAR_STOP extends AbstractServerPacket {
/** /**
* The packet OPCODE * The packet OPCODE
*/ */
@@ -35,7 +35,7 @@ public class SM_STOP extends AbstractServerPacket {
private L2Character character; private L2Character character;
public SM_STOP(L2Character character) { public SM_CHAR_STOP(L2Character character) {
super(OPCODE); super(OPCODE);
this.character = character; this.character = character;
} }

12
l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java
View File

@@ -63,6 +63,18 @@ public class SM_HTML extends AbstractServerPacket {
this.html = template.toHtmlString(); this.html = template.toHtmlString();
} }
public SM_HTML(String html) {
this(null, html);
}
public SM_HTML(Html html) {
this(null, html);
}
public SM_HTML(HtmlTemplate template) {
this(null, template);
}
@Override @Override
public void write(Lineage2Client conn, ChannelBuffer buffer) { public void write(Lineage2Client conn, ChannelBuffer buffer) {
buffer.writeInt((npc != null ? npc.getID().getID() : 0x01)); buffer.writeInt((npc != null ? npc.getID().getID() : 0x01));

12
l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java
View File

@@ -28,7 +28,7 @@ import com.l2jserver.game.net.packet.server.SM_ACTOR_DIE;
import com.l2jserver.game.net.packet.server.SM_ACTOR_MOVE; import com.l2jserver.game.net.packet.server.SM_ACTOR_MOVE;
import com.l2jserver.game.net.packet.server.SM_ACTOR_STATUS_UPDATE; import com.l2jserver.game.net.packet.server.SM_ACTOR_STATUS_UPDATE;
import com.l2jserver.game.net.packet.server.SM_ACTOR_STATUS_UPDATE.Stat; import com.l2jserver.game.net.packet.server.SM_ACTOR_STATUS_UPDATE.Stat;
import com.l2jserver.game.net.packet.server.SM_ATTACK; import com.l2jserver.game.net.packet.server.SM_ACTOR_ATTACK;
import com.l2jserver.game.net.packet.server.SM_CHAR_INFO; import com.l2jserver.game.net.packet.server.SM_CHAR_INFO;
import com.l2jserver.game.net.packet.server.SM_CHAR_INFO_BROADCAST; import com.l2jserver.game.net.packet.server.SM_CHAR_INFO_BROADCAST;
import com.l2jserver.game.net.packet.server.SM_CHAR_INFO_EXTRA; import com.l2jserver.game.net.packet.server.SM_CHAR_INFO_EXTRA;
@@ -39,7 +39,7 @@ import com.l2jserver.game.net.packet.server.SM_CHAR_TELEPORT;
import com.l2jserver.game.net.packet.server.SM_HTML; import com.l2jserver.game.net.packet.server.SM_HTML;
import com.l2jserver.game.net.packet.server.SM_ITEM_GROUND; import com.l2jserver.game.net.packet.server.SM_ITEM_GROUND;
import com.l2jserver.game.net.packet.server.SM_ITEM_PICK; import com.l2jserver.game.net.packet.server.SM_ITEM_PICK;
import com.l2jserver.game.net.packet.server.SM_MOVE_TYPE; import com.l2jserver.game.net.packet.server.SM_CHAR_MOVE_TYPE;
import com.l2jserver.game.net.packet.server.SM_NPC_INFO; import com.l2jserver.game.net.packet.server.SM_NPC_INFO;
import com.l2jserver.game.net.packet.server.SM_OBJECT_REMOVE; import com.l2jserver.game.net.packet.server.SM_OBJECT_REMOVE;
import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.CharacterID;
@@ -171,10 +171,10 @@ public class BroadcastServiceImpl extends AbstractService implements
// object is now out of sight // object is now out of sight
conn.write(new SM_OBJECT_REMOVE(object)); conn.write(new SM_OBJECT_REMOVE(object));
} else if (e instanceof CharacterWalkingEvent) { } else if (e instanceof CharacterWalkingEvent) {
conn.write(new SM_MOVE_TYPE(((CharacterWalkingEvent) e) conn.write(new SM_CHAR_MOVE_TYPE(((CharacterWalkingEvent) e)
.getCharacter())); .getCharacter()));
} else if (e instanceof CharacterRunningEvent) { } else if (e instanceof CharacterRunningEvent) {
conn.write(new SM_MOVE_TYPE(((CharacterRunningEvent) e) conn.write(new SM_CHAR_MOVE_TYPE(((CharacterRunningEvent) e)
.getCharacter())); .getCharacter()));
} else if (e instanceof ActorDieEvent) { } else if (e instanceof ActorDieEvent) {
conn.write(new SM_ACTOR_DIE(((ActorDieEvent) e).getActor())); conn.write(new SM_ACTOR_DIE(((ActorDieEvent) e).getActor()));
@@ -225,13 +225,13 @@ public class BroadcastServiceImpl extends AbstractService implements
conn.write(new SM_CHAR_INFO_EXTRA(character)); conn.write(new SM_CHAR_INFO_EXTRA(character));
broadcastAll(conn, character); broadcastAll(conn, character);
} else if (e instanceof ActorAttackHitEvent) { } else if (e instanceof ActorAttackHitEvent) {
conn.write(new SM_ATTACK(((ActorAttackHitEvent) e).getHit())); conn.write(new SM_ACTOR_ATTACK(((ActorAttackHitEvent) e).getHit()));
conn.sendSystemMessage(SystemMessage.YOU_DID_S1_DMG, conn.sendSystemMessage(SystemMessage.YOU_DID_S1_DMG,
(int) ((ActorAttackHitEvent) e).getHit() (int) ((ActorAttackHitEvent) e).getHit()
.getDamage()); .getDamage());
} else if (e instanceof CharacterWalkingEvent } else if (e instanceof CharacterWalkingEvent
|| e instanceof CharacterRunningEvent) { || e instanceof CharacterRunningEvent) {
conn.write(new SM_MOVE_TYPE((L2Character) e.getObject())); conn.write(new SM_CHAR_MOVE_TYPE((L2Character) e.getObject()));
} else if (e instanceof ActorTeleportingEvent) { } else if (e instanceof ActorTeleportingEvent) {
final ActorTeleportingEvent evt = (ActorTeleportingEvent) e; final ActorTeleportingEvent evt = (ActorTeleportingEvent) e;
conn.write(new SM_CHAR_TELEPORT((L2Character) evt conn.write(new SM_CHAR_TELEPORT((L2Character) evt