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

34
src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java
View File

@@ -57,8 +57,8 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler {
if (tab == 0) {
final List<Pair<Integer, Integer>> mobs = c.getPlayer().getMap().getMobsToSpawn();
if (num >= mobs.size() || c.getPlayer().getCP() < mobs.get(num).right) {
c.announce(PacketCreator.CPQMessage((byte) 1));
c.announce(PacketCreator.enableActions());
c.sendPacket(PacketCreator.CPQMessage((byte) 1));
c.sendPacket(PacketCreator.enableActions());
return;
}
@@ -66,8 +66,8 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler {
MonsterCarnival mcpq = c.getPlayer().getMonsterCarnival();
if (mcpq != null) {
if (!mcpq.canSummonR() && c.getPlayer().getTeam() == 0 || !mcpq.canSummonB() && c.getPlayer().getTeam() == 1) {
c.announce(PacketCreator.CPQMessage((byte) 2));
c.announce(PacketCreator.enableActions());
c.sendPacket(PacketCreator.CPQMessage((byte) 2));
c.sendPacket(PacketCreator.enableActions());
return;
}
@@ -82,7 +82,7 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler {
c.getPlayer().getMap().addMonsterSpawn(mob, 1, c.getPlayer().getTeam());
c.getPlayer().getMap().addAllMonsterSpawn(mob, 1, c.getPlayer().getTeam());
c.announce(PacketCreator.enableActions());
c.sendPacket(PacketCreator.enableActions());
}
neededCP = mobs.get(num).right;
@@ -90,13 +90,13 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler {
final List<Integer> skillid = c.getPlayer().getMap().getSkillIds();
if (num >= skillid.size()) {
c.getPlayer().dropMessage(5, "An unexpected error has occurred.");
c.announce(PacketCreator.enableActions());
c.sendPacket(PacketCreator.enableActions());
return;
}
final MCSkill skill = MapleCarnivalFactory.getInstance().getSkill(skillid.get(num)); //ugh wtf
if (skill == null || c.getPlayer().getCP() < skill.cpLoss) {
c.announce(PacketCreator.CPQMessage((byte) 1));
c.announce(PacketCreator.enableActions());
c.sendPacket(PacketCreator.CPQMessage((byte) 1));
c.sendPacket(PacketCreator.enableActions());
return;
}
final MapleDisease dis = skill.getDisease();
@@ -131,20 +131,20 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler {
}
}
neededCP = skill.cpLoss;
c.announce(PacketCreator.enableActions());
c.sendPacket(PacketCreator.enableActions());
} else if (tab == 2) { //protectors
final MCSkill skill = MapleCarnivalFactory.getInstance().getGuardian(num);
if (skill == null || c.getPlayer().getCP() < skill.cpLoss) {
c.announce(PacketCreator.CPQMessage((byte) 1));
c.announce(PacketCreator.enableActions());
c.sendPacket(PacketCreator.CPQMessage((byte) 1));
c.sendPacket(PacketCreator.enableActions());
return;
}
MonsterCarnival mcpq = c.getPlayer().getMonsterCarnival();
if (mcpq != null) {
if (!mcpq.canGuardianR() && c.getPlayer().getTeam() == 0 || !mcpq.canGuardianB() && c.getPlayer().getTeam() == 1) {
c.announce(PacketCreator.CPQMessage((byte) 2));
c.announce(PacketCreator.enableActions());
c.sendPacket(PacketCreator.CPQMessage((byte) 2));
c.sendPacket(PacketCreator.enableActions());
return;
}
@@ -152,17 +152,17 @@ public final class MonsterCarnivalHandler extends AbstractMaplePacketHandler {
if (success != 1) {
switch (success) {
case -1:
c.announce(PacketCreator.CPQMessage((byte) 3));
c.sendPacket(PacketCreator.CPQMessage((byte) 3));
break;
case 0:
c.announce(PacketCreator.CPQMessage((byte) 4));
c.sendPacket(PacketCreator.CPQMessage((byte) 4));
break;
default:
c.announce(PacketCreator.CPQMessage((byte) 3));
c.sendPacket(PacketCreator.CPQMessage((byte) 3));
}
c.announce(PacketCreator.enableActions());
c.sendPacket(PacketCreator.enableActions());
return;
} else {
neededCP = skill.cpLoss;