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

No delay on card pick-up + refactored item pickup process

Browse Source 
Fixed a issue on server delaying whenever a player gets a new card for
the mobbook. Some code refactoring unifying the several item picking-up
methods on the project.
This commit is contained in:
ronancpl
2017-05-21 15:17:18 -03:00
parent 7fcdc07b5b
commit 514656d238
8 changed files with 204 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
src/net/server/channel/handlers/PetLootHandler.java
View File

@@ -25,20 +25,13 @@ import client.MapleCharacter;
import client.MapleClient;
import client.inventory.MaplePet;
import net.AbstractMaplePacketHandler;
import server.MapleInventoryManipulator;
import server.maps.MapleMapItem;
import server.maps.MapleMapObject;
import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import client.inventory.MapleInventoryType;
import net.server.world.MaplePartyCharacter;
import scripting.item.ItemScriptManager;
import server.MapleItemInformationProvider;
import server.MapleItemInformationProvider.scriptedItem;
import constants.ServerConstants;
/**
* @author TheRamon
* @author TheRamon, Ronan
*/
public final class PetLootHandler extends AbstractMaplePacketHandler {
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
@@ -48,7 +41,8 @@ public final class PetLootHandler extends AbstractMaplePacketHandler {
return;
}
MaplePet pet = chr.getPet(chr.getPetIndex(slea.readInt()));//why would it be an int...?
int petIndex = chr.getPetIndex(slea.readInt());
MaplePet pet = chr.getPet(petIndex);
if (pet == null || !pet.isSummoned()) {
c.announce(MaplePacketCreator.enableActions());
return;
@@ -57,114 +51,6 @@ public final class PetLootHandler extends AbstractMaplePacketHandler {
slea.skip(13);
int oid = slea.readInt();
MapleMapObject ob = chr.getMap().getMapObject(oid);
if (ob == null) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.enableActions());
return;
}
if (ob instanceof MapleMapItem) {
MapleMapItem mapitem = (MapleMapItem) ob;
synchronized (mapitem) {
if (!chr.needQuestItem(mapitem.getQuest(), mapitem.getItemId())) {
c.announce(MaplePacketCreator.showItemUnavailable());
c.announce(MaplePacketCreator.enableActions());
return;
}
if(System.currentTimeMillis() - mapitem.getDropTime() < 900) {
c.announce(MaplePacketCreator.enableActions());
return;
}
if (mapitem.isPickedUp()) {
c.announce(MaplePacketCreator.showItemUnavailable());
c.announce(MaplePacketCreator.enableActions());
return;
}
if (mapitem.getDropper() == c.getPlayer()) {
c.announce(MaplePacketCreator.enableActions());
return;
}
if (mapitem.getMeso() > 0) {
if (chr.getParty() != null) {
int mesosamm = mapitem.getMeso();
if (mesosamm > 50000 * chr.getMesoRate()) {
c.announce(MaplePacketCreator.enableActions());
return;
}
int partynum = 0;
for (MaplePartyCharacter partymem : chr.getParty().getMembers()) {
if (partymem.isOnline() && partymem.getMapId() == chr.getMap().getId() && partymem.getChannel() == c.getChannel()) {
partynum++;
}
}
for (MaplePartyCharacter partymem : chr.getParty().getMembers()) {
if (partymem.isOnline() && partymem.getMapId() == chr.getMap().getId()) {
MapleCharacter somecharacter = c.getChannelServer().getPlayerStorage().getCharacterById(partymem.getId());
if (somecharacter != null) somecharacter.gainMeso(mesosamm / partynum, true, true, false);
}
}
chr.getMap().broadcastMessage(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 5, chr.getId(), true, chr.getPetIndex(pet)), mapitem.getPosition());
chr.getMap().removeMapObject(ob);
} else if (chr.getInventory(MapleInventoryType.EQUIPPED).findById(1812000) != null) {
chr.gainMeso(mapitem.getMeso(), true, true, false);
chr.getMap().broadcastMessage(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 5, chr.getId(), true, chr.getPetIndex(pet)), mapitem.getPosition());
chr.getMap().removeMapObject(ob);
} else {
mapitem.setPickedUp(false);
c.announce(MaplePacketCreator.enableActions());
return;
}
} else if (ItemPickupHandler.useItem(c, mapitem.getItem().getItemId())) {
if (mapitem.getItem().getItemId() / 10000 == 238) {
chr.getMonsterBook().addCard(c, mapitem.getItem().getItemId());
}
mapitem.setPickedUp(true);
chr.getMap().broadcastMessage(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 5, chr.getId(), true, chr.getPetIndex(pet)), mapitem.getPosition());
chr.getMap().removeMapObject(ob);
} else if (mapitem.getItem().getItemId() / 100 == 50000) {
if (chr.getInventory(MapleInventoryType.EQUIPPED).findById(1812007) != null) {
for (int i : chr.getExcluded()) {
if (mapitem.getItem().getItemId() == i) {
c.announce(MaplePacketCreator.enableActions());
return;
}
}
} else if (MapleInventoryManipulator.addById(c, mapitem.getItem().getItemId(), mapitem.getItem().getQuantity(), null, -1, mapitem.getItem().getExpiration())) {
chr.getMap().broadcastMessage(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 5, chr.getId(), true, chr.getPetIndex(pet)), mapitem.getPosition());
chr.getMap().removeMapObject(ob);
} else {
c.announce(MaplePacketCreator.enableActions());
return;
}
} else if (mapitem.getItem().getItemId() / 10000 == 243) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
scriptedItem info = ii.getScriptedItemInfo(mapitem.getItem().getItemId());
if (info.runOnPickup()) {
ItemScriptManager ism = ItemScriptManager.getInstance();
String scriptName = info.getScript();
if (ism.scriptExists(scriptName))
ism.getItemScript(c, scriptName);
} else {
MapleInventoryManipulator.addFromDrop(c, mapitem.getItem(), true);
}
chr.getMap().broadcastMessage(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 5, chr.getId(), true, chr.getPetIndex(pet)), mapitem.getPosition());
chr.getMap().removeMapObject(ob);
} else if(mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866) {
// Add NX to account, show effect and make item disappear
chr.getCashShop().gainCash(1, mapitem.getItemId() == 4031865 ? 100 : 250);
chr.getMap().broadcastMessage(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 5, chr.getId(), true, chr.getPetIndex(pet)), mapitem.getPosition());
chr.getMap().removeMapObject(ob);
} else if (MapleInventoryManipulator.addFromDrop(c, mapitem.getItem(), true)) {
chr.getMap().broadcastMessage(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 5, chr.getId(), true, chr.getPetIndex(pet)), mapitem.getPosition());
chr.getMap().removeMapObject(ob);
} else {
c.announce(MaplePacketCreator.enableActions());
return;
}
mapitem.setPickedUp(true);
}
}
c.announce(MaplePacketCreator.enableActions());
chr.pickupItem(ob, petIndex);
}
}