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/net/server/channel/handlers/PlayerInteractionHandler.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.game.GameConstants;
import constants.inventory.ItemConstants;
@@ -511,7 +511,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
if (trade != null) {
if ((quantity <= item.getQuantity() && quantity >= 0) || ItemConstants.isRechargeable(item.getItemId())) {
if (ii.isDropRestricted(item.getItemId())) { // ensure that undroppable items do not make it to the trade window
if (!MapleKarmaManipulator.hasKarmaFlag(item)) {
if (!KarmaManipulator.hasKarmaFlag(item)) {
c.sendPacket(PacketCreator.serverNotice(1, "That item is untradeable."));
c.sendPacket(PacketCreator.enableActions());
return;

6
src/main/java/net/server/channel/handlers/UseCashItemHandler.java
View File

@@ -26,7 +26,7 @@ import client.creator.veteran.*;
import client.inventory.*;
import client.inventory.Equip.ScrollResult;
import client.inventory.manipulator.InventoryManipulator;
import client.inventory.manipulator.MapleKarmaManipulator;
import client.inventory.manipulator.KarmaManipulator;
import client.processor.npc.DueyProcessor;
import client.processor.stat.AssignAPProcessor;
import client.processor.stat.AssignSPProcessor;
@@ -507,12 +507,12 @@ public final class UseCashItemHandler extends AbstractPacketHandler {
InventoryType type = InventoryType.getByType((byte) p.readInt());
short slot = (short) p.readInt();
Item item = player.getInventory(type).getItem(slot);
if (item == null || item.getQuantity() <= 0 || MapleKarmaManipulator.hasKarmaFlag(item) || !ii.isKarmaAble(item.getItemId())) {
if (item == null || item.getQuantity() <= 0 || KarmaManipulator.hasKarmaFlag(item) || !ii.isKarmaAble(item.getItemId())) {
c.sendPacket(PacketCreator.enableActions());
return;
}
MapleKarmaManipulator.setKarmaFlag(item);
KarmaManipulator.setKarmaFlag(item);
player.forceUpdateItem(item);
remove(c, position, itemId);
c.sendPacket(PacketCreator.enableActions());

4
src/main/java/net/server/channel/handlers/WeddingHandler.java
View File

@@ -13,7 +13,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.AbstractPacketHandler;
@@ -71,7 +71,7 @@ public final class WeddingHandler extends AbstractPacketHandler {
marriage.addGiftItem(groomWishlist, newItem);
InventoryManipulator.removeFromSlot(c, type, slot, quantity, false, false);
MapleKarmaManipulator.toggleKarmaFlagToUntradeable(newItem);
KarmaManipulator.toggleKarmaFlagToUntradeable(newItem);
marriage.setIntProperty(groomWishlistProp, giftCount + 1);
c.sendPacket(WeddingPackets.onWeddingGiftResult((byte) 0xB, marriage.getWishlistItems(groomWishlist), Collections.singletonList(newItem)));