Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

All packet creating methods now create Packet instead of byte[]

Browse Source 
This commit got way too big...
- Remove deprecated methods for sending packets
- Favor OutPacket & Packet over MaplePacketLittleEndianWriter, LittleEndianWriter, and byte array
- Split up some packet creating methods into separate classes
This commit is contained in:
P0nk
2021-08-21 01:36:51 +02:00
parent b5cd6887ae
commit 8f6860d7d7
231 changed files with 6403 additions and 6927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/server/maps/MapleDoorObject.java
View File

@@ -91,7 +91,7 @@ public class MapleDoorObject extends AbstractMapleMapObject {
public void warp(final MapleCharacter chr) {
MapleParty party = chr.getParty();
if (chr.getId() == ownerId || (party != null && party.getMemberById(ownerId) != null)) {
chr.announce(PacketCreator.playPortalSound());
chr.sendPacket(PacketCreator.playPortalSound());
if(!inTown() && party == null) {
chr.changeMap(to, getLinkedPortalId());
@@ -99,8 +99,8 @@ public class MapleDoorObject extends AbstractMapleMapObject {
chr.changeMap(to, getLinkedPortalPosition());
}
} else {
chr.getClient().announce(PacketCreator.blockedMessage(6));
chr.getClient().announce(PacketCreator.enableActions());
chr.sendPacket(PacketCreator.blockedMessage(6));
chr.sendPacket(PacketCreator.enableActions());
}
}
@@ -113,12 +113,12 @@ public class MapleDoorObject extends AbstractMapleMapObject {
MapleCharacter chr = client.getPlayer();
if (this.getFrom().getId() == chr.getMapId()) {
if (chr.getParty() != null && (this.getOwnerId() == chr.getId() || chr.getParty().getMemberById(this.getOwnerId()) != null)) {
chr.announce(PacketCreator.partyPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition()));
chr.sendPacket(PacketCreator.partyPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition()));
}
chr.announce(PacketCreator.spawnPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition()));
chr.sendPacket(PacketCreator.spawnPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition()));
if (!this.inTown()) {
chr.announce(PacketCreator.spawnDoor(this.getOwnerId(), this.getPosition(), launched));
chr.sendPacket(PacketCreator.spawnDoor(this.getOwnerId(), this.getPosition(), launched));
}
}
}
@@ -129,16 +129,16 @@ public class MapleDoorObject extends AbstractMapleMapObject {
if (from.getId() == chr.getMapId()) {
MapleParty party = chr.getParty();
if (party != null && (ownerId == chr.getId() || party.getMemberById(ownerId) != null)) {
client.announce(PacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
client.sendPacket(PacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
}
client.announce(PacketCreator.removeDoor(ownerId, inTown()));
client.sendPacket(PacketCreator.removeDoor(ownerId, inTown()));
}
}
public void sendDestroyData(MapleClient client, boolean partyUpdate) {
if (client != null && from.getId() == client.getPlayer().getMapId()) {
client.announce(PacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
client.announce(PacketCreator.removeDoor(ownerId, inTown()));
client.sendPacket(PacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
client.sendPacket(PacketCreator.removeDoor(ownerId, inTown()));
}
}