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

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

@@ -16,7 +16,6 @@ import tools.PacketCreator;
import java.util.Map;
/**
*
* @author Xari
* @author Ronan - added concurrency protection and quest progress limit
*/
@@ -27,7 +26,7 @@ public class RaiseIncExpHandler extends AbstractPacketHandler {
byte inventorytype = p.readByte();//nItemIT
short slot = p.readShort();//nSlotPosition
int itemid = p.readInt();//nItemID
if (c.tryacquireClient()) {
try {
ItemInformationProvider ii = ItemInformationProvider.getInstance();
@@ -38,14 +37,14 @@ public class RaiseIncExpHandler extends AbstractPacketHandler {
int infoNumber = consItem.questid;
Map<Integer, Integer> consumables = consItem.items;
Character chr = c.getPlayer();
Quest quest = Quest.getInstanceFromInfoNumber(infoNumber);
if (!chr.getQuest(quest).getStatus().equals(QuestStatus.Status.STARTED)) {
c.sendPacket(PacketCreator.enableActions());
return;
}
int consId;
Inventory inv = chr.getInventory(InventoryType.getByType(inventorytype));
inv.lockInventory();
@@ -59,11 +58,11 @@ public class RaiseIncExpHandler extends AbstractPacketHandler {
} finally {
inv.unlockInventory();
}
int questid = quest.getId();
int nextValue = Math.min(consumables.get(consId) + c.getAbstractPlayerInteraction().getQuestProgressInt(questid, infoNumber), consItem.exp * consItem.grade);
c.getAbstractPlayerInteraction().setQuestProgress(questid, infoNumber, nextValue);
c.sendPacket(PacketCreator.enableActions());
} finally {
c.releaseClient();