ronancpl
efbce82a8b
Fixed autocommit getting called early/unavailable in a few catch blocks, when trying to save player. Fixed the missing variable declaration in several quest scripts that were recently formatted. Reworked the EXP loss formula applied at a knock-out. The new formula follows past discussions in several MS forums. Fixed a deadlock issue related with party HP and party doors management. Refactored management of packets sent to client through an IoSession. New system no longer makes use of a synchronized statement when calling announce(packet), rather makes use of dedicated threads to send queued packets for the respective players. Fixed SP reset allowing increase of unexpected skills. Refactored storages, no longer instantiated as coupled with the character, rather instantiated in a map within the world object, with accountid as key. Reviewed usage of character objects of offline party members, that weren't being properly checked. Fixed some unexpected cases with buffs and morphs (within the enhanced buff system) making the latter show up as another morph figure. Added a "priority buff" perspective within the enhanced buff system, to let such priority items/skills take awareness over other buffs. (This would be vital for some quests, as the one reported in #514 ) Fixed EXP gains in certain scenarios showing up with less amount than the expected (due to float point operations). Fixed a critical bug that have emerged in a recent mount-skill update, issue happened due to an improper object initialization. Fixed mount information packet not being relayed to the player at world login time, rendering some quests not startable until the mob levels up.
208 lines
14 KiB
Java
208 lines
14 KiB
Java
/*
|
|
This file is part of the OdinMS Maple Story Server
|
|
Copyright (C) 2008 Patrick Huy <[email protected]>
|
|
Matthias Butz <[email protected]>
|
|
Jan Christian Meyer <[email protected]>
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU Affero General Public License as
|
|
published by the Free Software Foundation version 3 as published by
|
|
the Free Software Foundation. You may not use, modify or distribute
|
|
this program under any other version of the GNU Affero General Public
|
|
License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU Affero General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Affero General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package client.processor;
|
|
|
|
import client.MapleClient;
|
|
import client.MapleCharacter;
|
|
import client.autoban.AutobanFactory;
|
|
import client.inventory.Item;
|
|
import client.inventory.MapleInventory;
|
|
import client.inventory.MapleInventoryType;
|
|
import client.inventory.manipulator.MapleKarmaManipulator;
|
|
import constants.ItemConstants;
|
|
import constants.ServerConstants;
|
|
import client.inventory.manipulator.MapleInventoryManipulator;
|
|
import server.MapleItemInformationProvider;
|
|
import server.MapleStorage;
|
|
import tools.FilePrinter;
|
|
import tools.MaplePacketCreator;
|
|
import tools.data.input.SeekableLittleEndianAccessor;
|
|
|
|
/**
|
|
*
|
|
* @author Matze
|
|
* @author Ronan - inventory concurrency protection on storing items
|
|
*/
|
|
public class StorageProcessor {
|
|
|
|
public static void storageAction(SeekableLittleEndianAccessor slea, MapleClient c) {
|
|
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
|
|
MapleCharacter chr = c.getPlayer();
|
|
MapleStorage storage = chr.getStorage();
|
|
byte mode = slea.readByte();
|
|
|
|
if (chr.getLevel() < 15){
|
|
chr.dropMessage(1, "You may only use the storage once you have reached level 15.");
|
|
c.announce(MaplePacketCreator.enableActions());
|
|
return;
|
|
}
|
|
|
|
if (c.tryacquireClient()) {
|
|
try {
|
|
if (mode == 4) { // take out
|
|
byte type = slea.readByte();
|
|
byte slot = slea.readByte();
|
|
if (slot < 0 || slot > storage.getSlots()) { // removal starts at zero
|
|
AutobanFactory.PACKET_EDIT.alert(c.getPlayer(), c.getPlayer().getName() + " tried to packet edit with storage.");
|
|
FilePrinter.print(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to work with storage slot " + slot);
|
|
c.disconnect(true, false);
|
|
return;
|
|
}
|
|
slot = storage.getSlot(MapleInventoryType.getByType(type), slot);
|
|
Item item = storage.getItem(slot);
|
|
if (item != null) {
|
|
if (ii.isPickupRestricted(item.getItemId()) && chr.haveItemWithId(item.getItemId(), true)) {
|
|
c.announce(MaplePacketCreator.getStorageError((byte) 0x0C));
|
|
return;
|
|
}
|
|
|
|
int takeoutFee = storage.getTakeOutFee();
|
|
if (chr.getMeso() < takeoutFee) {
|
|
c.announce(MaplePacketCreator.getStorageError((byte) 0x0B));
|
|
return;
|
|
} else {
|
|
chr.gainMeso(-takeoutFee, false);
|
|
}
|
|
|
|
if (MapleInventoryManipulator.checkSpace(c, item.getItemId(), item.getQuantity(), item.getOwner())) {
|
|
if (storage.takeOut(item)) {
|
|
chr.setUsedStorage();
|
|
|
|
MapleKarmaManipulator.toggleKarmaFlagToUntradeable(item);
|
|
MapleInventoryManipulator.addFromDrop(c, item, false);
|
|
|
|
String itemName = ii.getName(item.getItemId());
|
|
FilePrinter.print(FilePrinter.STORAGE + c.getAccountName() + ".txt", c.getPlayer().getName() + " took out " + item.getQuantity() + " " + itemName + " (" + item.getItemId() + ")");
|
|
|
|
storage.sendTakenOut(c, item.getInventoryType());
|
|
} else {
|
|
c.announce(MaplePacketCreator.enableActions());
|
|
return;
|
|
}
|
|
} else {
|
|
c.announce(MaplePacketCreator.getStorageError((byte) 0x0A));
|
|
}
|
|
}
|
|
} else if (mode == 5) { // store
|
|
short slot = slea.readShort();
|
|
int itemId = slea.readInt();
|
|
short quantity = slea.readShort();
|
|
MapleInventoryType invType = ItemConstants.getInventoryType(itemId);
|
|
MapleInventory inv = chr.getInventory(invType);
|
|
if (slot < 1 || slot > inv.getSlotLimit()) { //player inv starts at one
|
|
AutobanFactory.PACKET_EDIT.alert(c.getPlayer(), c.getPlayer().getName() + " tried to packet edit with storage.");
|
|
FilePrinter.print(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to store item at slot " + slot);
|
|
c.disconnect(true, false);
|
|
return;
|
|
}
|
|
if (quantity < 1) {
|
|
c.announce(MaplePacketCreator.enableActions());
|
|
return;
|
|
}
|
|
if (storage.isFull()) {
|
|
c.announce(MaplePacketCreator.getStorageError((byte) 0x11));
|
|
return;
|
|
}
|
|
|
|
int storeFee = storage.getStoreFee();
|
|
if (chr.getMeso() < storeFee) {
|
|
c.announce(MaplePacketCreator.getStorageError((byte) 0x0B));
|
|
} else {
|
|
Item item;
|
|
|
|
inv.lockInventory(); // thanks imbee for pointing a dupe within storage
|
|
try {
|
|
item = inv.getItem(slot);
|
|
if (item != null && item.getItemId() == itemId && (item.getQuantity() >= quantity || ItemConstants.isRechargeable(itemId))) {
|
|
if (ItemConstants.isWeddingRing(itemId) || ItemConstants.isWeddingToken(itemId)) {
|
|
c.announce(MaplePacketCreator.enableActions());
|
|
return;
|
|
}
|
|
|
|
if (ItemConstants.isRechargeable(itemId)) {
|
|
quantity = item.getQuantity();
|
|
}
|
|
|
|
MapleInventoryManipulator.removeFromSlot(c, invType, slot, quantity, false);
|
|
} else {
|
|
c.announce(MaplePacketCreator.enableActions());
|
|
return;
|
|
}
|
|
|
|
item = item.copy(); // thanks Robin Schulz & BHB88 for noticing a inventory glitch when storing items
|
|
} finally {
|
|
inv.unlockInventory();
|
|
}
|
|
|
|
chr.gainMeso(-storeFee, false, true, false);
|
|
|
|
MapleKarmaManipulator.toggleKarmaFlagToUntradeable(item);
|
|
item.setQuantity(quantity);
|
|
|
|
storage.store(item); // inside a critical section, "!(storage.isFull())" is still in effect...
|
|
chr.setUsedStorage();
|
|
|
|
String itemName = ii.getName(item.getItemId());
|
|
FilePrinter.print(FilePrinter.STORAGE + c.getAccountName() + ".txt", c.getPlayer().getName() + " stored " + item.getQuantity() + " " + itemName + " (" + item.getItemId() + ")");
|
|
|
|
storage.sendStored(c, ItemConstants.getInventoryType(itemId));
|
|
}
|
|
} else if (mode == 6) { // arrange items
|
|
if(ServerConstants.USE_STORAGE_ITEM_SORT) storage.arrangeItems(c);
|
|
c.announce(MaplePacketCreator.enableActions());
|
|
} else if (mode == 7) { // meso
|
|
int meso = slea.readInt();
|
|
int storageMesos = storage.getMeso();
|
|
int playerMesos = chr.getMeso();
|
|
if ((meso > 0 && storageMesos >= meso) || (meso < 0 && playerMesos >= -meso)) {
|
|
if (meso < 0 && (storageMesos - meso) < 0) {
|
|
meso = Integer.MIN_VALUE + storageMesos;
|
|
if (meso < playerMesos) {
|
|
c.announce(MaplePacketCreator.enableActions());
|
|
return;
|
|
}
|
|
} else if (meso > 0 && (playerMesos + meso) < 0) {
|
|
meso = Integer.MAX_VALUE - playerMesos;
|
|
if (meso > storageMesos) {
|
|
c.announce(MaplePacketCreator.enableActions());
|
|
return;
|
|
}
|
|
}
|
|
storage.setMeso(storageMesos - meso);
|
|
chr.gainMeso(meso, false, true, false);
|
|
chr.setUsedStorage();
|
|
FilePrinter.print(FilePrinter.STORAGE + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + (meso > 0 ? " took out " : " stored ") + Math.abs(meso) + " mesos");
|
|
storage.sendMeso(c);
|
|
} else {
|
|
c.announce(MaplePacketCreator.enableActions());
|
|
return;
|
|
}
|
|
} else if (mode == 8) {// close... unless the player decides to enter cash shop!
|
|
storage.close();
|
|
}
|
|
} finally {
|
|
c.releaseClient();
|
|
}
|
|
}
|
|
}
|
|
}
|