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

Rename and clean up MapleKarmaManipulator

Browse Source
This commit is contained in:
P0nk
2021-09-09 20:55:47 +02:00
parent b2cbb65c6a
commit 065ef632ac
10 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/client/inventory/Item.java
View File

@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package client.inventory;
import client.inventory.manipulator.MapleKarmaManipulator;
import client.inventory.manipulator.KarmaManipulator;
import constants.inventory.ItemConstants;
import server.MapleItemInformationProvider;
@@ -189,6 +189,6 @@ public class Item implements Comparable<Item> {
}
public boolean isUntradeable() {
return ((this.getFlag() & ItemConstants.UNTRADEABLE) == ItemConstants.UNTRADEABLE) || (MapleItemInformationProvider.getInstance().isDropRestricted(this.getItemId()) && !MapleKarmaManipulator.hasKarmaFlag(this));
return ((this.getFlag() & ItemConstants.UNTRADEABLE) == ItemConstants.UNTRADEABLE) || (MapleItemInformationProvider.getInstance().isDropRestricted(this.getItemId()) && !KarmaManipulator.hasKarmaFlag(this));
}
}

13
src/main/java/client/inventory/manipulator/MapleKarmaManipulator.java → src/main/java/client/inventory/manipulator/KarmaManipulator.java
View File

@@ -19,18 +19,17 @@
*/
package client.inventory.manipulator;
import constants.inventory.ItemConstants;
import client.inventory.Item;
import constants.inventory.ItemConstants;
/**
*
* @author RonanLana
*/
public class MapleKarmaManipulator {
public class KarmaManipulator {
private static short getKarmaFlag(Item item) {
return item.getItemType() == 1 ? ItemConstants.KARMA_EQP : ItemConstants.KARMA_USE;
}
public static boolean hasKarmaFlag(Item item) {
short karmaFlag = getKarmaFlag(item);
return (item.getFlag() & karmaFlag) == karmaFlag;
@@ -39,7 +38,7 @@ public class MapleKarmaManipulator {
public static void toggleKarmaFlagToUntradeable(Item item) {
short karmaFlag = getKarmaFlag(item);
short flag = item.getFlag();
if ((flag & karmaFlag) == karmaFlag) {
flag ^= karmaFlag;
flag |= ItemConstants.UNTRADEABLE;
@@ -47,11 +46,11 @@ public class MapleKarmaManipulator {
item.setFlag((byte) flag);
}
}
public static void setKarmaFlag(Item item) {
short karmaFlag = getKarmaFlag(item);
short flag = item.getFlag();
flag |= karmaFlag;
flag &= (0xFFFFFFFF ^ ItemConstants.UNTRADEABLE);
item.setFlag((byte) flag);

4
src/main/java/client/processor/npc/DueyProcessor.java
View File

@@ -31,7 +31,7 @@ import client.inventory.InventoryType;
import client.inventory.Item;
import client.inventory.ItemFactory;
import client.inventory.manipulator.InventoryManipulator;
import client.inventory.manipulator.MapleKarmaManipulator;
import client.inventory.manipulator.KarmaManipulator;
import config.YamlConfig;
import constants.inventory.ItemConstants;
import net.server.channel.Channel;
@@ -267,7 +267,7 @@ public class DueyProcessor {
inv.unlockInventory();
}
MapleKarmaManipulator.toggleKarmaFlagToUntradeable(item);
KarmaManipulator.toggleKarmaFlagToUntradeable(item);
item.setQuantity(amount);
if (!insertPackageItem(packageId, item)) {

6
src/main/java/client/processor/npc/StorageProcessor.java
View File

@@ -28,7 +28,7 @@ import client.inventory.Inventory;
import client.inventory.InventoryType;
import client.inventory.Item;
import client.inventory.manipulator.InventoryManipulator;
import client.inventory.manipulator.MapleKarmaManipulator;
import client.inventory.manipulator.KarmaManipulator;
import config.YamlConfig;
import constants.inventory.ItemConstants;
import net.packet.InPacket;
@@ -87,7 +87,7 @@ public class StorageProcessor {
if (storage.takeOut(item)) {
chr.setUsedStorage();
MapleKarmaManipulator.toggleKarmaFlagToUntradeable(item);
KarmaManipulator.toggleKarmaFlagToUntradeable(item);
InventoryManipulator.addFromDrop(c, item, false);
String itemName = ii.getName(item.getItemId());
@@ -155,7 +155,7 @@ public class StorageProcessor {
chr.gainMeso(-storeFee, false, true, false);
MapleKarmaManipulator.toggleKarmaFlagToUntradeable(item);
KarmaManipulator.toggleKarmaFlagToUntradeable(item);
item.setQuantity(quantity);
storage.store(item); // inside a critical section, "!(storage.isFull())" is still in effect...