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

Rename and clean up MapleQuestStatus

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:23:06 +02:00
parent f4f5e12a50
commit 8af0999510
16 changed files with 122 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@ package net.server.channel.handlers;
import client.Character;
import client.Client;
import client.MapleQuestStatus;
import client.QuestStatus;
import client.inventory.Inventory;
import client.inventory.InventoryType;
import client.inventory.manipulator.InventoryManipulator;
@@ -41,7 +41,7 @@ public class RaiseIncExpHandler extends AbstractPacketHandler {
Character chr = c.getPlayer();
MapleQuest quest = MapleQuest.getInstanceFromInfoNumber(infoNumber);
if (!chr.getQuest(quest).getStatus().equals(MapleQuestStatus.Status.STARTED)) {
if (!chr.getQuest(quest).getStatus().equals(QuestStatus.Status.STARTED)) {
c.sendPacket(PacketCreator.enableActions());
return;
}

8
src/main/java/net/server/channel/handlers/RaiseUIStateHandler.java
View File

@@ -3,7 +3,7 @@ package net.server.channel.handlers;
import client.Character;
import client.Character.DelayedQuestUpdate;
import client.Client;
import client.MapleQuestStatus;
import client.QuestStatus;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import scripting.quest.QuestScriptManager;
@@ -23,14 +23,14 @@ public class RaiseUIStateHandler extends AbstractPacketHandler {
try {
Character chr = c.getPlayer();
MapleQuest quest = MapleQuest.getInstanceFromInfoNumber(infoNumber);
MapleQuestStatus mqs = chr.getQuest(quest);
QuestStatus mqs = chr.getQuest(quest);
QuestScriptManager.getInstance().raiseOpen(c, (short) infoNumber, mqs.getNpc());
if (mqs.getStatus() == MapleQuestStatus.Status.NOT_STARTED) {
if (mqs.getStatus() == QuestStatus.Status.NOT_STARTED) {
quest.forceStart(chr, 22000);
c.getAbstractPlayerInteraction().setQuestProgress(quest.getId(), infoNumber, 0);
} else if (mqs.getStatus() == MapleQuestStatus.Status.STARTED) {
} else if (mqs.getStatus() == QuestStatus.Status.STARTED) {
chr.announceUpdateQuest(DelayedQuestUpdate.UPDATE, mqs, mqs.getInfoNumber() > 0);
}
} finally {