Rename and clean up MapleQuest
This commit is contained in:
@@ -33,7 +33,7 @@ import server.life.LifeFactory;
|
||||
import server.life.Monster;
|
||||
import server.maps.MapObject;
|
||||
import server.maps.MapObjectType;
|
||||
import server.quest.MapleQuest;
|
||||
import server.quest.Quest;
|
||||
import tools.PacketCreator;
|
||||
import tools.Randomizer;
|
||||
|
||||
@@ -135,7 +135,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
|
||||
}
|
||||
break;
|
||||
case 0x16: // Questreset
|
||||
MapleQuest.getInstance(p.readShort()).reset(c.getPlayer());
|
||||
Quest.getInstance(p.readShort()).reset(c.getPlayer());
|
||||
break;
|
||||
case 0x17: // Summon
|
||||
int mobId = p.readInt();
|
||||
|
||||
@@ -27,7 +27,7 @@ import net.AbstractPacketHandler;
|
||||
import net.packet.InPacket;
|
||||
import scripting.quest.QuestScriptManager;
|
||||
import server.life.NPC;
|
||||
import server.quest.MapleQuest;
|
||||
import server.quest.Quest;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
@@ -38,7 +38,7 @@ import java.awt.*;
|
||||
public final class QuestActionHandler extends AbstractPacketHandler {
|
||||
|
||||
// isNpcNearby thanks to GabrielSin
|
||||
private static boolean isNpcNearby(InPacket p, Character player, MapleQuest quest, int npcId) {
|
||||
private static boolean isNpcNearby(InPacket p, Character player, Quest quest, int npcId) {
|
||||
Point playerP;
|
||||
Point pos = player.getPosition();
|
||||
|
||||
@@ -72,7 +72,7 @@ public final class QuestActionHandler extends AbstractPacketHandler {
|
||||
byte action = p.readByte();
|
||||
short questid = p.readShort();
|
||||
Character player = c.getPlayer();
|
||||
MapleQuest quest = MapleQuest.getInstance(questid);
|
||||
Quest quest = Quest.getInstance(questid);
|
||||
|
||||
if (action == 0) { // Restore lost item, Credits Darter ( Rajan )
|
||||
p.readInt();
|
||||
|
||||
@@ -10,7 +10,7 @@ import net.AbstractPacketHandler;
|
||||
import net.packet.InPacket;
|
||||
import server.MapleItemInformationProvider;
|
||||
import server.MapleItemInformationProvider.QuestConsItem;
|
||||
import server.quest.MapleQuest;
|
||||
import server.quest.Quest;
|
||||
import tools.PacketCreator;
|
||||
|
||||
import java.util.Map;
|
||||
@@ -40,7 +40,7 @@ public class RaiseIncExpHandler extends AbstractPacketHandler {
|
||||
Map<Integer, Integer> consumables = consItem.items;
|
||||
|
||||
Character chr = c.getPlayer();
|
||||
MapleQuest quest = MapleQuest.getInstanceFromInfoNumber(infoNumber);
|
||||
Quest quest = Quest.getInstanceFromInfoNumber(infoNumber);
|
||||
if (!chr.getQuest(quest).getStatus().equals(QuestStatus.Status.STARTED)) {
|
||||
c.sendPacket(PacketCreator.enableActions());
|
||||
return;
|
||||
|
||||
@@ -7,7 +7,7 @@ import client.QuestStatus;
|
||||
import net.AbstractPacketHandler;
|
||||
import net.packet.InPacket;
|
||||
import scripting.quest.QuestScriptManager;
|
||||
import server.quest.MapleQuest;
|
||||
import server.quest.Quest;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -22,7 +22,7 @@ public class RaiseUIStateHandler extends AbstractPacketHandler {
|
||||
if (c.tryacquireClient()) {
|
||||
try {
|
||||
Character chr = c.getPlayer();
|
||||
MapleQuest quest = MapleQuest.getInstanceFromInfoNumber(infoNumber);
|
||||
Quest quest = Quest.getInstanceFromInfoNumber(infoNumber);
|
||||
QuestStatus mqs = chr.getQuest(quest);
|
||||
|
||||
QuestScriptManager.getInstance().raiseOpen(c, (short) infoNumber, mqs.getNpc());
|
||||
|
||||
Reference in New Issue
Block a user