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

Rename and clean up MapleQuest

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:42:02 +02:00
parent 75d631bebb
commit fef273ecc9
55 changed files with 436 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/server/Server.java
View File

@@ -61,7 +61,7 @@ import server.ThreadManager;
import server.TimerManager;
import server.expeditions.ExpeditionBossLog;
import server.life.PlayerNPCFactory;
import server.quest.MapleQuest;
import server.quest.Quest;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.Pair;
@@ -839,7 +839,7 @@ public class Server {
final List<Future<?>> futures = new ArrayList<>();
futures.add(initExecutor.submit(() -> SkillFactory.loadAllSkills()));
futures.add(initExecutor.submit(() -> CashItemFactory.loadAllCashItems()));
futures.add(initExecutor.submit(() -> MapleQuest.loadAllQuests()));
futures.add(initExecutor.submit(() -> Quest.loadAllQuests()));
futures.add(initExecutor.submit(() -> MapleSkillbookInformationProvider.loadAllSkillbookInformation()));
futures.add(initExecutor.submit(() -> PlayerNPCFactory.loadFactoryMetadata()));

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

@@ -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();

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

@@ -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();

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

@@ -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;

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

@@ -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());