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;