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

Reformat and clean up "net" package

Browse Source
This commit is contained in:
P0nk
2021-09-09 23:26:02 +02:00
parent 69f4580637
commit 6be6ea9927
235 changed files with 3556 additions and 3398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,17 +32,16 @@ import server.quest.Quest;
import java.awt.*;
/**
*
* @author Matze
*/
public final class QuestActionHandler extends AbstractPacketHandler {
// isNpcNearby thanks to GabrielSin
private static boolean isNpcNearby(InPacket p, Character player, Quest quest, int npcId) {
Point playerP;
Point pos = player.getPosition();
if(p.available() >= 4) {
if (p.available() >= 4) {
playerP = new Point(p.readShort(), p.readShort());
if (playerP.distance(pos) > 1000) { // thanks Darter (YungMoozi) for reporting unchecked player position
playerP = pos;
@@ -50,50 +49,50 @@ public final class QuestActionHandler extends AbstractPacketHandler {
} else {
playerP = pos;
}
if (!quest.isAutoStart() && !quest.isAutoComplete()) {
NPC npc = player.getMap().getNPCById(npcId);
if(npc == null) {
if (npc == null) {
return false;
}
Point npcP = npc.getPosition();
if (Math.abs(npcP.getX() - playerP.getX()) > 1200 || Math.abs(npcP.getY() - playerP.getY()) > 800) {
player.dropMessage(5, "Approach the NPC to fulfill this quest operation.");
return false;
}
}
return true;
}
@Override
public final void handlePacket(InPacket p, Client c) {
byte action = p.readByte();
short questid = p.readShort();
Character player = c.getPlayer();
Quest quest = Quest.getInstance(questid);
if (action == 0) { // Restore lost item, Credits Darter ( Rajan )
p.readInt();
int itemid = p.readInt();
quest.restoreLostItem(player, itemid);
} else if (action == 1) { //Start Quest
int npc = p.readInt();
if(!isNpcNearby(p, player, quest, npc)) {
if (!isNpcNearby(p, player, quest, npc)) {
return;
}
if(quest.canStart(player, npc)) {
if (quest.canStart(player, npc)) {
quest.start(player, npc);
}
} else if (action == 2) { // Complete Quest
int npc = p.readInt();
if(!isNpcNearby(p, player, quest, npc)) {
if (!isNpcNearby(p, player, quest, npc)) {
return;
}
if(quest.canComplete(player, npc)) {
if (quest.canComplete(player, npc)) {
if (p.available() >= 2) {
int selection = p.readShort();
quest.complete(player, npc, selection);
@@ -105,20 +104,20 @@ public final class QuestActionHandler extends AbstractPacketHandler {
quest.forfeit(player);
} else if (action == 4) { // scripted start quest
int npc = p.readInt();
if(!isNpcNearby(p, player, quest, npc)) {
if (!isNpcNearby(p, player, quest, npc)) {
return;
}
if(quest.canStart(player, npc)) {
if (quest.canStart(player, npc)) {
QuestScriptManager.getInstance().start(c, questid, npc);
}
} else if (action == 5) { // scripted end quests
int npc = p.readInt();
if(!isNpcNearby(p, player, quest, npc)) {
if (!isNpcNearby(p, player, quest, npc)) {
return;
}
if(quest.canComplete(player, npc)) {
if (quest.canComplete(player, npc)) {
QuestScriptManager.getInstance().end(c, questid, npc);
}
}