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

Rename and clean up MapleDisease

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:15:22 +02:00
parent b07e6799dc
commit 0c721b85dd
14 changed files with 149 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,16 +29,16 @@ public final class CancelDebuffHandler extends AbstractPacketHandler {//TIP: BAD
@Override
public final void handlePacket(InPacket p, Client c) {
/*List<MapleDisease> diseases = c.getPlayer().getDiseases();
List<MapleDisease> diseases_ = new ArrayList<MapleDisease>();
for (MapleDisease disease : diseases) {
List<MapleDisease> disease_ = new ArrayList<MapleDisease>();
/*List<Disease> diseases = c.getPlayer().getDiseases();
List<Disease> diseases_ = new ArrayList<Disease>();
for (Disease disease : diseases) {
List<Disease> disease_ = new ArrayList<Disease>();
disease_.add(disease);
diseases_.add(disease);
c.sendPacket(PacketCreator.cancelDebuff(disease_));
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.cancelForeignDebuff(c.getPlayer().getId(), disease_), false);
}
for (MapleDisease disease : diseases_) {
for (Disease disease : diseases_) {
c.getPlayer().removeDisease(disease);
}*/
}

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

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
import client.Character;
import client.Client;
import client.MapleDisease;
import client.Disease;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.world.MapleParty;
@@ -99,7 +99,7 @@ public final class MonsterCarnivalHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.enableActions());
return;
}
final MapleDisease dis = skill.getDisease();
final Disease dis = skill.getDisease();
MapleParty enemies = c.getPlayer().getParty().getEnemy();
if (skill.targetsAll) {
int hitChance = 0;

6
src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java
View File

@@ -210,7 +210,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
player.silentGiveBuffs(timedBuffs);
}
Map<MapleDisease, Pair<Long, MobSkill>> diseases = server.getPlayerBuffStorage().getDiseasesFromStorage(cid);
Map<Disease, Pair<Long, MobSkill>> diseases = server.getPlayerBuffStorage().getDiseasesFromStorage(cid);
if (diseases != null) {
player.silentApplyDiseases(diseases);
}
@@ -362,8 +362,8 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
}
if (diseases != null) {
for (Entry<MapleDisease, Pair<Long, MobSkill>> e : diseases.entrySet()) {
final List<Pair<MapleDisease, Integer>> debuff = Collections.singletonList(new Pair<>(e.getKey(), e.getValue().getRight().getX()));
for (Entry<Disease, Pair<Long, MobSkill>> e : diseases.entrySet()) {
final List<Pair<Disease, Integer>> debuff = Collections.singletonList(new Pair<>(e.getKey(), e.getValue().getRight().getX()));
c.sendPacket(PacketCreator.giveDebuff(debuff, e.getValue().getRight()));
}
}

12
src/main/java/net/server/channel/handlers/UseItemHandler.java
View File

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
import client.Character;
import client.Client;
import client.MapleDisease;
import client.Disease;
import client.inventory.InventoryType;
import client.inventory.Item;
import client.inventory.manipulator.InventoryManipulator;
@@ -58,17 +58,17 @@ public final class UseItemHandler extends AbstractPacketHandler {
remove(c, slot);
return;
} else if (itemId == 2050001) {
chr.dispelDebuff(MapleDisease.DARKNESS);
chr.dispelDebuff(Disease.DARKNESS);
remove(c, slot);
return;
} else if (itemId == 2050002) {
chr.dispelDebuff(MapleDisease.WEAKEN);
chr.dispelDebuff(MapleDisease.SLOW);
chr.dispelDebuff(Disease.WEAKEN);
chr.dispelDebuff(Disease.SLOW);
remove(c, slot);
return;
} else if (itemId == 2050003) {
chr.dispelDebuff(MapleDisease.SEAL);
chr.dispelDebuff(MapleDisease.CURSE);
chr.dispelDebuff(Disease.SEAL);
chr.dispelDebuff(Disease.CURSE);
remove(c, slot);
return;
} else if (ItemConstants.isTownScroll(itemId)) {