MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Start mobequip refactor

Browse Source
This commit is contained in:
MagicBot
2024-03-18 10:01:29 -04:00
parent 0590ae64e7
commit 61c4cb1361
56 changed files with 198 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/ClientMessagePump.java
+11 -11
View File
@@ -199,7 +199,7 @@ public class ClientMessagePump implements NetMsgHandler {
if (!NPCVaultBankRangeCheck(player, origin, "bank"))
return;
CharacterItemManager itemManager = player.getCharItemManager();
CharacterItemManager itemManager = player.charItemManager;
if (itemManager == null)
return;
@@ -256,7 +256,7 @@ public class ClientMessagePump implements NetMsgHandler {
if (!NPCVaultBankRangeCheck(player, origin, "bank"))
return;
CharacterItemManager itemManager = player.getCharItemManager();
CharacterItemManager itemManager = player.charItemManager;
if (itemManager == null)
return;
@@ -400,7 +400,7 @@ public class ClientMessagePump implements NetMsgHandler {
private static void DeleteItem(DeleteItemMsg msg, ClientConnection origin) {
CharacterItemManager itemManager = origin.getPlayerCharacter().getCharItemManager();
CharacterItemManager itemManager = origin.getPlayerCharacter().charItemManager;
int uuid = msg.getUUID();
@@ -689,9 +689,9 @@ public class ClientMessagePump implements NetMsgHandler {
if (!GroupManager.goldSplit(player, item, origin, tar)) {
if (tar.getCharItemManager() != null) {
if (tar.charItemManager != null) {
itemRet = tar.getCharItemManager().lootItemFromMe(item, player, origin);
itemRet = tar.charItemManager.lootItemFromMe(item, player, origin);
//Take equipment off mob
if (tar.getObjectType() == GameObjectType.Mob && itemRet != null) {
@@ -699,9 +699,9 @@ public class ClientMessagePump implements NetMsgHandler {
if (item != null && item.getObjectType() == GameObjectType.MobLoot) {
for (Item equip : mobTarget.getEquip().values()) {
for (Item equip : mobTarget.charItemManager.equipped.values()) {
TransferItemFromEquipToInventoryMsg back = new TransferItemFromEquipToInventoryMsg(mobTarget, equip.slot);
TransferItemFromEquipToInventoryMsg back = new TransferItemFromEquipToInventoryMsg(mobTarget, equip.equipSlot);
DispatchMessage.dispatchMsgToInterestArea(mobTarget, back, DispatchChannel.SECONDARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
LootMsg lootMsg = new LootMsg(0, 0, tar.getObjectType().ordinal(), tar.getObjectUUID(), equip);
@@ -1037,7 +1037,7 @@ public class ClientMessagePump implements NetMsgHandler {
if (player == null)
return;
CharacterItemManager itemMan = player.getCharItemManager();
CharacterItemManager itemMan = player.charItemManager;
if (itemMan == null)
return;
@@ -1058,14 +1058,14 @@ public class ClientMessagePump implements NetMsgHandler {
int cost = 0;
if (npc.getCharItemManager().getInventoryCount() > 150) {
if (npc.charItemManager.getInventoryCount() > 150) {
if (npc.getParentZone() != null && npc.getParentZone().playerCityUUID == 0) {
ArrayList<Item> inv = npc.getInventory();
for (int i = 0; i < 20; i++) {
try {
Item toRemove = inv.get(i);
if (toRemove != null)
npc.getCharItemManager().delete(toRemove);
npc.charItemManager.delete(toRemove);
} catch (Exception e) {
break;
}
@@ -1091,7 +1091,7 @@ public class ClientMessagePump implements NetMsgHandler {
return;
if (npc.getParentZone() != null && npc.getParentZone().playerCityUUID != 0)
if (!npc.getCharItemManager().hasRoomInventory(sell.template.item_wt)) {
if (!npc.charItemManager.hasRoomInventory(sell.template.item_wt)) {
ErrorPopupMsg.sendErrorPopup(player, 21);
return;
src/engine/net/client/handlers/ActivateNPCMsgHandler.java
+2 -2
View File
@@ -86,12 +86,12 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
if (contractItem == null)
return false;
if (!player.getCharItemManager().doesCharOwnThisItem(contractItem.getObjectUUID())) {
if (!player.charItemManager.doesCharOwnThisItem(contractItem.getObjectUUID())) {
Logger.error(player.getName() + "has attempted to place Hireling : " + contractItem.getName() + "without a valid contract!");
return false;
}
itemMan = player.getCharItemManager();
itemMan = player.charItemManager;
zone = ZoneManager.findSmallestZone(building.getLoc());
src/engine/net/client/handlers/BuyFromNPCMsgHandler.java
+3 -3
View File
@@ -46,7 +46,7 @@ public class BuyFromNPCMsgHandler extends AbstractClientMsgHandler {
if (origin.buyLock.tryLock()) {
try {
CharacterItemManager itemMan = sourcePlayer.getCharItemManager();
CharacterItemManager itemMan = sourcePlayer.charItemManager;
if (itemMan == null)
return true;
@@ -123,7 +123,7 @@ public class BuyFromNPCMsgHandler extends AbstractClientMsgHandler {
}
} else if (buyFromNPCMsg.getItemType() == Enum.GameObjectType.Item.ordinal()) {
CharacterItemManager npcCim = npc.getCharItemManager();
CharacterItemManager npcCim = npc.charItemManager;
if (npcCim == null)
return true;
@@ -189,7 +189,7 @@ public class BuyFromNPCMsgHandler extends AbstractClientMsgHandler {
} else if (buyFromNPCMsg.getItemType() == Enum.GameObjectType.MobLoot.ordinal()) {
CharacterItemManager npcCim = npc.getCharItemManager();
CharacterItemManager npcCim = npc.charItemManager;
if (npcCim == null)
return true;
src/engine/net/client/handlers/GuildCreationFinalizeHandler.java
+3 -5
View File
@@ -26,9 +26,7 @@ import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.ErrorPopupMsg;
import engine.net.client.msg.guild.GuildCreationFinalizeMsg;
import engine.net.client.msg.guild.GuildInfoMsg;
import engine.objects.Guild;
import engine.objects.Item;
import engine.objects.PlayerCharacter;
import engine.objects.*;
import engine.util.StringUtils;
public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
@@ -131,8 +129,8 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
player.setInnerCouncil(true);
player.setFullMember(true);
player.setGuildTitle(charterType.getNumberOfRanks() - 1);
player.getCharItemManager().delete(charter);
player.getCharItemManager().updateInventory();
player.charItemManager.delete(charter);
player.charItemManager.updateInventory();
player.incVer();
DispatchMessage.sendToAllInRange(player, new GuildInfoMsg(player, newGuild, 2));
src/engine/net/client/handlers/ItemProductionMsgHandler.java
+14 -14
View File
@@ -129,18 +129,18 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
if (targetItem.template.item_type.equals(ItemType.GOLD))
return;
if (!vendor.getCharItemManager().hasRoomInventory(targetItem.template.item_wt)) {
if (!vendor.charItemManager.hasRoomInventory(targetItem.template.item_wt)) {
ErrorPopupMsg.sendErrorPopup(player, 21);
return;
}
itemMan = origin.getPlayerCharacter().getCharItemManager();
itemMan = origin.getPlayerCharacter().charItemManager;
if (itemMan == null)
return;
if (vendor.getCharItemManager().getInventoryWeight() > 500) {
if (vendor.charItemManager.getInventoryWeight() > 500) {
ErrorPopupMsg.sendErrorPopup(player, 21);
return;
}
@@ -166,7 +166,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
dispatch = Dispatch.borrow(player, outMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
origin.getPlayerCharacter().getCharItemManager().updateInventory();
origin.getPlayerCharacter().charItemManager.updateInventory();
} catch (Exception e) {
Logger.error(e);
} finally {
@@ -199,7 +199,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
return;
if (!vendor.getCharItemManager().forgeContains(targetItem, vendor))
if (!vendor.charItemManager.forgeContains(targetItem, vendor))
return;
boolean worked = DbManager.ItemQueries.UPDATE_FORGE_TO_INVENTORY(targetItem);
@@ -213,7 +213,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
targetItem.containerType = Enum.ItemContainerType.INVENTORY;
targetItem.setOwner(vendor);
vendor.getCharItemManager().addItemToInventory(targetItem);
vendor.charItemManager.addItemToInventory(targetItem);
vendor.removeItemFromForge(targetItem);
@@ -269,9 +269,9 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
if (targetItem.template.item_type.equals(ItemType.GOLD))
return;
if (!vendor.getCharItemManager().doesCharOwnThisItem(targetItem.getObjectUUID()))
if (!vendor.charItemManager.doesCharOwnThisItem(targetItem.getObjectUUID()))
continue;
if (vendor.getCharItemManager().inventoryContains(targetItem) == false)
if (vendor.charItemManager.inventoryContains(targetItem) == false)
continue;
itemValue = targetItem.template.item_value;
@@ -293,7 +293,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
}
totalValue += itemValue;
long start = System.currentTimeMillis();
vendor.getCharItemManager().recycle(targetItem);
vendor.charItemManager.recycle(targetItem);
long end = System.currentTimeMillis();
long timetook = end - start;
@@ -347,7 +347,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
return;
if (!vendor.getCharItemManager().forgeContains(targetItem, vendor))
if (!vendor.charItemManager.forgeContains(targetItem, vendor))
return;
// Cannot junk items without a forge!
@@ -404,17 +404,17 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
if (targetItem.template.item_type.equals(ItemType.GOLD))
return;
if (vendor.getCharItemManager().inventoryContains(targetItem) == false)
if (vendor.charItemManager.inventoryContains(targetItem) == false)
return;
if (player.getCharItemManager().hasRoomInventory(targetItem.template.item_wt) == false)
if (player.charItemManager.hasRoomInventory(targetItem.template.item_wt) == false)
return;
player.getCharItemManager().buyFromNPC(targetItem, vendor);
player.charItemManager.buyFromNPC(targetItem, vendor);
}
player.getCharItemManager().updateInventory();
player.charItemManager.updateInventory();
// Update NPC inventory to client
src/engine/net/client/handlers/ObjectActionMsgHandler.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
return true;
}
itemMan = player.getCharItemManager();
itemMan = player.charItemManager;
if (itemMan == null) {
return true;
src/engine/net/client/handlers/OrderNPCMsgHandler.java
+4 -4
View File
@@ -44,11 +44,11 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
Item item;
player = SessionManager.getPlayerCharacter(origin);
itemMan = player.getCharItemManager();
itemMan = player.charItemManager;
contract = hireling.contract;
if (!player.getCharItemManager().hasRoomInventory((short) 1)) {
if (!player.charItemManager.hasRoomInventory((short) 1)) {
ErrorPopupMsg.sendErrorPopup(player, 21);
return;
}
@@ -400,7 +400,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
return true;
if (player.getCharItemManager().getTradingWith() != null) {
if (player.charItemManager.getTradingWith() != null) {
ErrorPopupMsg.sendErrorMsg(player, "Cannot barter and trade with same timings.");
return true;
}
@@ -512,7 +512,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
if (!building.getHirelings().containsKey(mob))
return true;
if (player.getCharItemManager().getTradingWith() != null) {
if (player.charItemManager.getTradingWith() != null) {
ErrorPopupMsg.sendErrorMsg(player, "Cannot barter and trade with same timings.");
return true;
}
src/engine/net/client/handlers/PlaceAssetMsgHandler.java
+10 -10
View File
@@ -388,7 +388,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
case WAREHOUSE:
if (contract == null)
break;
if (!playerCharacter.getCharItemManager().doesCharOwnThisItem(contract.getObjectUUID()))
if (!playerCharacter.charItemManager.doesCharOwnThisItem(contract.getObjectUUID()))
break;
buildingCreated = placeWarehouse(playerCharacter, origin, msg);
break;
@@ -396,28 +396,28 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
case BULWARK:
if (contract == null)
break;
if (!playerCharacter.getCharItemManager().doesCharOwnThisItem(contract.getObjectUUID()))
if (!playerCharacter.charItemManager.doesCharOwnThisItem(contract.getObjectUUID()))
break;
buildingCreated = placeSiegeEquip(playerCharacter, origin, msg);
break;
case SPIRE:
if (contract == null)
break;
if (!playerCharacter.getCharItemManager().doesCharOwnThisItem(contract.getObjectUUID()))
if (!playerCharacter.charItemManager.doesCharOwnThisItem(contract.getObjectUUID()))
break;
buildingCreated = placeSpire(playerCharacter, origin, msg);
break;
case SHRINE:
if (contract == null)
break;
if (!playerCharacter.getCharItemManager().doesCharOwnThisItem(contract.getObjectUUID()))
if (!playerCharacter.charItemManager.doesCharOwnThisItem(contract.getObjectUUID()))
break;
buildingCreated = placeShrine(playerCharacter, origin, msg);
break;
case BARRACK:
if (contract == null)
break;
if (!playerCharacter.getCharItemManager().doesCharOwnThisItem(contract.getObjectUUID()))
if (!playerCharacter.charItemManager.doesCharOwnThisItem(contract.getObjectUUID()))
break;
buildingCreated = placeBarrack(playerCharacter, origin, msg);
break;
@@ -433,7 +433,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
default:
if (contract == null)
break;
if (!playerCharacter.getCharItemManager().doesCharOwnThisItem(contract.getObjectUUID()))
if (!playerCharacter.charItemManager.doesCharOwnThisItem(contract.getObjectUUID()))
break;
buildingCreated = placeSingleBuilding(playerCharacter, origin, msg);
break;
@@ -448,8 +448,8 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
// Remove the appropriate deed.
if (buildingCreated == true)
if (contract != null) {
playerCharacter.getCharItemManager().delete(contract);
playerCharacter.getCharItemManager().updateInventory();
playerCharacter.charItemManager.delete(contract);
playerCharacter.charItemManager.updateInventory();
}
// Close the window. We're done!
@@ -1033,7 +1033,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
return false;
if (player.getCharItemManager().getGoldTrading() > 0) {
if (player.charItemManager.getGoldTrading() > 0) {
ErrorPopupMsg.sendErrorPopup(player, 195);
return false;
}
@@ -1050,7 +1050,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
// We need to be able to access how much gold a character is carrying
itemMan = player.getCharItemManager();
itemMan = player.charItemManager;
if (itemMan == null)
src/engine/net/client/handlers/RepairMsgHandler.java
+3 -3
View File
@@ -60,7 +60,7 @@ public class RepairMsgHandler extends AbstractClientMsgHandler {
} else if (repairMsg.getMsgType() == 0) { //Request RepairObject
CharacterItemManager itemMan = player.getCharItemManager();
CharacterItemManager itemMan = player.charItemManager;
if (itemMan == null)
return true;
@@ -116,10 +116,10 @@ public class RepairMsgHandler extends AbstractClientMsgHandler {
return true;
}
if (player.getCharItemManager().getGoldInventory().getNumOfItems() - cost < 0)
if (player.charItemManager.getGoldInventory().getNumOfItems() - cost < 0)
return true;
if (player.getCharItemManager().getGoldInventory().getNumOfItems() - cost > MBServerStatics.PLAYER_GOLD_LIMIT)
if (player.charItemManager.getGoldInventory().getNumOfItems() - cost > MBServerStatics.PLAYER_GOLD_LIMIT)
return true;
if (!itemMan.buyFromNPC(building, cost, cost)) {
src/engine/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java
+2 -5
View File
@@ -12,10 +12,7 @@ import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.PlaceAssetMsg;
import engine.net.client.msg.TransferGoldToFromBuildingMsg;
import engine.net.client.msg.UpdateGoldMsg;
import engine.objects.Building;
import engine.objects.CharacterItemManager;
import engine.objects.Item;
import engine.objects.PlayerCharacter;
import engine.objects.*;
import org.pmw.tinylog.Logger;
/*
@@ -71,7 +68,7 @@ public class TransferGoldToFromBuildingMsgHandler extends AbstractClientMsgHandl
//building.getTimestamps().put(MBServerStatics.STRONGBOX_DELAY_STRING, System.currentTimeMillis() + MBServerStatics.ONE_MINUTE);
itemMan = player.getCharItemManager();
itemMan = player.charItemManager;
goldItem = itemMan.getGoldInventory();
src/engine/net/client/handlers/TransferItemFromEquipToInventoryHandler.java
+2 -5
View File
@@ -16,10 +16,7 @@ import engine.net.client.ClientConnection;
import engine.net.client.msg.ApplyEffectMsg;
import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.TransferItemFromEquipToInventoryMsg;
import engine.objects.CharacterItemManager;
import engine.objects.Effect;
import engine.objects.Item;
import engine.objects.PlayerCharacter;
import engine.objects.*;
import engine.server.MBServerStatics;
public class TransferItemFromEquipToInventoryHandler extends AbstractClientMsgHandler {
@@ -38,7 +35,7 @@ public class TransferItemFromEquipToInventoryHandler extends AbstractClientMsgHa
TransferItemFromEquipToInventoryMsg msg = (TransferItemFromEquipToInventoryMsg) baseMsg;
CharacterItemManager itemManager = player.getCharItemManager();
CharacterItemManager itemManager = player.charItemManager;
if (itemManager == null)
return true;
src/engine/net/client/handlers/TransferItemFromInventoryToEquipHandler.java
+2 -5
View File
@@ -19,10 +19,7 @@ import engine.net.client.msg.ApplyEffectMsg;
import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.TransferItemFromEquipToInventoryMsg;
import engine.net.client.msg.TransferItemFromInventoryToEquipMsg;
import engine.objects.CharacterItemManager;
import engine.objects.Effect;
import engine.objects.Item;
import engine.objects.PlayerCharacter;
import engine.objects.*;
import engine.server.MBServerStatics;
public class TransferItemFromInventoryToEquipHandler extends AbstractClientMsgHandler {
@@ -36,7 +33,7 @@ public class TransferItemFromInventoryToEquipHandler extends AbstractClientMsgHa
PlayerCharacter playerCharacter = origin.getPlayerCharacter();
TransferItemFromInventoryToEquipMsg transferMsg = (TransferItemFromInventoryToEquipMsg) baseMsg;
CharacterItemManager itemManager = playerCharacter.getCharItemManager();
CharacterItemManager itemManager = playerCharacter.charItemManager;
if (itemManager == null) {
forceTransferFromEquipToInventory(transferMsg, origin, "Can't find your item manager");
src/engine/net/client/msg/BuyFromNPCWindowMsg.java
+2 -2
View File
@@ -97,7 +97,7 @@ public class BuyFromNPCWindowMsg extends ClientNetMsg {
ArrayList<Item> sellInventory = null;
if (npc != null) {
man = npc.getCharItemManager();
man = npc.charItemManager;
Contract contract = npc.getContract();
if (player != null) {
float barget = player.getBargain();
@@ -149,7 +149,7 @@ public class BuyFromNPCWindowMsg extends ClientNetMsg {
for (Item Item : sellInventory) {
try {
Item.serializeForVendor(Item, writer, sellPercent);
Item._serializeForVendor(Item, writer, sellPercent);
} catch (SerializationException se) {
continue;
}
src/engine/net/client/msg/LootMsg.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class LootMsg extends ClientNetMsg {
else if (this.Item != null)
try {
Item._serializeForClientMsg(this.Item, writer, false);
} catch (SerializationException e) {
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
src/engine/net/client/msg/RefineMsg.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class RefineMsg extends ClientNetMsg {
//update player
pc.applyBonuses();
pc.getCharItemManager().RemoveEquipmentFromLackOfSkill(pc, true);
pc.charItemManager.RemoveEquipmentFromLackOfSkill(pc, true);
//echo refine message back
src/engine/net/client/msg/ShowBankInventoryMsg.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class ShowBankInventoryMsg extends ClientNetMsg {
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
ArrayList<Item> bank = pc.getCharItemManager().getBank();
ArrayList<Item> bank = pc.charItemManager.getBank();
writer.put((byte) 1); // static value
Item.putList(writer, bank, false, pc.getObjectUUID());
src/engine/net/client/msg/TrainMsg.java
+8 -8
View File
@@ -72,12 +72,12 @@ public class TrainMsg extends ClientNetMsg {
if (origin.trainLock.tryLock()) {
try {
Item gold = playerCharacter.getCharItemManager().getGoldInventory();
Item gold = playerCharacter.charItemManager.getGoldInventory();
if (gold == null)
return;
if (!gold.validForInventory(origin, playerCharacter, playerCharacter.getCharItemManager()))
if (!gold.validForInventory(origin, playerCharacter, playerCharacter.charItemManager))
return;
boolean canTrain = false;
@@ -190,7 +190,7 @@ public class TrainMsg extends ClientNetMsg {
float profitCost = cost * npc.getSellPercent(playerCharacter);
profitCost += .5f;
if (profitCost > playerCharacter.getCharItemManager().getGoldInventory().getNumOfItems())
if (profitCost > playerCharacter.charItemManager.getGoldInventory().getNumOfItems())
return;
Building b = npc.getBuilding();
if (b != null && b.getProtectionState().equals(ProtectionState.NPC))
@@ -201,16 +201,16 @@ public class TrainMsg extends ClientNetMsg {
return;
}
if (playerCharacter.getCharItemManager().getGoldInventory().getNumOfItems() - profitCost < 0)
if (playerCharacter.charItemManager.getGoldInventory().getNumOfItems() - profitCost < 0)
return;
if (playerCharacter.getCharItemManager().getGoldInventory().getNumOfItems() - profitCost > MBServerStatics.PLAYER_GOLD_LIMIT)
if (playerCharacter.charItemManager.getGoldInventory().getNumOfItems() - profitCost > MBServerStatics.PLAYER_GOLD_LIMIT)
return;
//attempt to train
if (sk.train(playerCharacter)) {
playerCharacter.getCharItemManager().buyFromNPC(b, (int) profitCost, (int) (profitCost - cost));
playerCharacter.charItemManager.buyFromNPC(b, (int) profitCost, (int) (profitCost - cost));
dispatch = Dispatch.borrow(playerCharacter, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
@@ -253,7 +253,7 @@ public class TrainMsg extends ClientNetMsg {
float cost = (int) cp.getTrainingCost(playerCharacter, npc);
float profitCost = cost * npc.getSellPercent(playerCharacter);
profitCost += .5f;
if (profitCost > playerCharacter.getCharItemManager().getGoldInventory().getNumOfItems()) {
if (profitCost > playerCharacter.charItemManager.getGoldInventory().getNumOfItems()) {
// ChatManager.chatSystemError(pc, "You do not have enough gold to train this skill.");
return;
}
@@ -269,7 +269,7 @@ public class TrainMsg extends ClientNetMsg {
}
if (cp.train(playerCharacter)) {
if (!playerCharacter.getCharItemManager().buyFromNPC(b, (int) profitCost, (int) (profitCost - cost)))
if (!playerCharacter.charItemManager.buyFromNPC(b, (int) profitCost, (int) (profitCost - cost)))
ChatManager.chatSystemError(playerCharacter, "Failed to Withdrawl gold from inventory. Contact CCR");
//train succeeded
src/engine/net/client/msg/UpdateGoldMsg.java
+2 -5
View File
@@ -15,10 +15,7 @@ import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
import engine.net.client.Protocol;
import engine.objects.AbstractWorldObject;
import engine.objects.CharacterItemManager;
import engine.objects.Item;
import engine.objects.PlayerCharacter;
import engine.objects.*;
/**
* Update gold in inventory and/or bank
@@ -76,7 +73,7 @@ public class UpdateGoldMsg extends ClientNetMsg {
public void configure() {
if (this.looter != null && this.looter.getObjectType() == GameObjectType.PlayerCharacter) {
itemManager = ((PlayerCharacter) looter).getCharItemManager();
itemManager = ((PlayerCharacter) looter).charItemManager;
goldInventory = itemManager.getGoldInventory();
this.tradeGold = itemManager.getGoldTrading();
goldBank = itemManager.getGoldBank();
src/engine/net/client/msg/UpdateTradeWindowMsg.java
+2 -2
View File
@@ -63,7 +63,7 @@ public class UpdateTradeWindowMsg extends ClientNetMsg {
ArrayList<Item> trading1 = new ArrayList<>();
for (int itemID : pc1.getCharItemManager().getTrading()) {
for (int itemID : pc1.charItemManager.getTrading()) {
Item item = Item.getFromCache(itemID);
if (item == null)
continue;
@@ -71,7 +71,7 @@ public class UpdateTradeWindowMsg extends ClientNetMsg {
}
ArrayList<Item> trading2 = new ArrayList<>();
for (int itemID : pc2.getCharItemManager().getTrading()) {
for (int itemID : pc2.charItemManager.getTrading()) {
Item item = Item.getFromCache(itemID);
if (item == null)
continue;
src/engine/net/client/msg/VendorDialogMsg.java
+2 -2
View File
@@ -607,7 +607,7 @@ public class VendorDialogMsg extends ClientNetMsg {
if (ac == null)
return;
CharacterItemManager itemManager = playerCharacter.getCharItemManager();
CharacterItemManager itemManager = playerCharacter.charItemManager;
if (itemManager == null)
return;
@@ -660,7 +660,7 @@ public class VendorDialogMsg extends ClientNetMsg {
if (cc == null)
return;
CharacterItemManager itemManager = playerCharacter.getCharItemManager();
CharacterItemManager itemManager = playerCharacter.charItemManager;
if (itemManager == null)
return;