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

Make MCSkill immutable with record

Browse Source
This commit is contained in:
P0nk
2022-09-03 14:44:14 +02:00
parent 9e0479fe9f
commit 15c4188d48
4 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,14 +95,14 @@ public final class MonsterCarnivalHandler extends AbstractPacketHandler {
return;
}
final MCSkill skill = CarnivalFactory.getInstance().getSkill(skillid.get(num)); //ugh wtf
if (skill == null || c.getPlayer().getCP() < skill.cpLoss) {
if (skill == null || c.getPlayer().getCP() < skill.cpLoss()) {
c.sendPacket(PacketCreator.CPQMessage((byte) 1));
c.sendPacket(PacketCreator.enableActions());
return;
}
final Disease dis = skill.getDisease();
Party enemies = c.getPlayer().getParty().getEnemy();
if (skill.targetsAll) {
if (skill.targetsAll()) {
int hitChance = rollHitChance(dis.getMobSkillType());
if (hitChance <= 80) {
for (PartyCharacter mpc : enemies.getPartyMembers()) {
@@ -128,11 +128,11 @@ public final class MonsterCarnivalHandler extends AbstractPacketHandler {
}
}
}
neededCP = skill.cpLoss;
neededCP = skill.cpLoss();
c.sendPacket(PacketCreator.enableActions());
} else if (tab == 2) { //protectors
final MCSkill skill = CarnivalFactory.getInstance().getGuardian(num);
if (skill == null || c.getPlayer().getCP() < skill.cpLoss) {
if (skill == null || c.getPlayer().getCP() < skill.cpLoss()) {
c.sendPacket(PacketCreator.CPQMessage((byte) 1));
c.sendPacket(PacketCreator.enableActions());
return;
@@ -163,7 +163,7 @@ public final class MonsterCarnivalHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.enableActions());
return;
} else {
neededCP = skill.cpLoss;
neededCP = skill.cpLoss();
}
}
}