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

Renamed class to not conflict with the java.lang version.

Browse Source
This commit is contained in:
MagicBot
2024-04-05 07:59:44 -04:00
parent dd84615ca1
commit c1ee6f5b52
388 changed files with 1807 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/CharacterItemManager.java
+32 -32
View File
@@ -9,11 +9,11 @@
package engine.objects;
import engine.Enum;
import engine.Enum.GameObjectType;
import engine.Enum.ItemType;
import engine.gameManager.*;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
import engine.mbEnums.ItemType;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
@@ -36,7 +36,7 @@ public class CharacterItemManager {
private final ConcurrentHashMap<Integer, Integer> itemIDtoType = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
// Mapping of all items equipped in this Manager
// Key = Item Slot
public ConcurrentHashMap<Enum.EquipSlotType, Item> equipped = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
public ConcurrentHashMap<mbEnums.EquipSlotType, Item> equipped = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
private final HashSet<Item> inventory = new HashSet<>();
private final HashSet<Item> bank = new HashSet<>();
private final HashSet<Item> vault = new HashSet<>();
@@ -73,7 +73,7 @@ public class CharacterItemManager {
public void loadGoldItems() {
if (ConfigManager.serverType.equals(Enum.ServerType.LOGINSERVER)) {
if (ConfigManager.serverType.equals(mbEnums.ServerType.LOGINSERVER)) {
//other server, just make generic
this.goldInventory = new MobLoot(this.absCharacter, 0);
this.goldBank = new MobLoot(this.absCharacter, 0);
@@ -84,14 +84,14 @@ public class CharacterItemManager {
//create inventory gold if needed
if (this.goldInventory == null)
if (this.absCharacter != null && (this.absCharacter.getObjectType().equals(GameObjectType.PlayerCharacter) || this.absCharacter.getObjectType().equals(GameObjectType.NPC)))
this.goldInventory = Item.newGoldItem(this.absCharacter, Enum.ItemContainerType.INVENTORY);
this.goldInventory = Item.newGoldItem(this.absCharacter, mbEnums.ItemContainerType.INVENTORY);
else
this.goldInventory = new MobLoot(this.absCharacter, 0);
//create bank gold if needed
if (this.goldBank == null)
if (this.absCharacter != null && this.absCharacter.getObjectType().equals(GameObjectType.PlayerCharacter))
this.goldBank = Item.newGoldItem(this.absCharacter, Enum.ItemContainerType.BANK);
this.goldBank = Item.newGoldItem(this.absCharacter, mbEnums.ItemContainerType.BANK);
else
this.goldBank = new MobLoot(this.absCharacter, 0);
@@ -115,7 +115,7 @@ public class CharacterItemManager {
this.account = ((PlayerCharacter) this.absCharacter).getAccount();
// Get Items for player and vault
if (ConfigManager.serverType.equals(Enum.ServerType.LOGINSERVER)) //login, only need equipped items
if (ConfigManager.serverType.equals(mbEnums.ServerType.LOGINSERVER)) //login, only need equipped items
al = DbManager.ItemQueries.GET_EQUIPPED_ITEMS(this.absCharacter.getObjectUUID());
else
al = DbManager.ItemQueries.GET_ITEMS_FOR_PC(this.absCharacter.getObjectUUID());
@@ -300,7 +300,7 @@ public class CharacterItemManager {
return false;
}
} else {
if (!Warehouse.withdraw(warehouse, (PlayerCharacter) this.absCharacter, Enum.ResourceType.GOLD, amount * -1, true, true)) {
if (!Warehouse.withdraw(warehouse, (PlayerCharacter) this.absCharacter, mbEnums.ResourceType.GOLD, amount * -1, true, true)) {
ErrorPopupMsg.sendErrorPopup((PlayerCharacter) this.absCharacter, 203);
return false;
@@ -365,7 +365,7 @@ public class CharacterItemManager {
ugm.configure();
Dispatch dispatch = Dispatch.borrow(player, ugm);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return success;
}
@@ -393,7 +393,7 @@ public class CharacterItemManager {
return false;
dispatch = Dispatch.borrow(target, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return true;
}
@@ -403,7 +403,7 @@ public class CharacterItemManager {
Dispatch dispatch;
dispatch = Dispatch.borrow(requester, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return true;
}
@@ -431,10 +431,10 @@ public class CharacterItemManager {
if (playerA.lastBuildingAccessed != 0) {
ManageCityAssetsMsg mca = new ManageCityAssetsMsg();
mca.actionType = 4;
mca.setTargetType(Enum.GameObjectType.Building.ordinal());
mca.setTargetType(mbEnums.GameObjectType.Building.ordinal());
mca.setTargetID(playerA.lastBuildingAccessed);
Dispatch dispatch = Dispatch.borrow(playerA, mca);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
playerA.lastBuildingAccessed = 0;
}
@@ -459,10 +459,10 @@ public class CharacterItemManager {
man2.getTradeCommitted());
dispatch = Dispatch.borrow((PlayerCharacter) this.getOwner(), modify);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
dispatch = Dispatch.borrow((PlayerCharacter) man2.getOwner(), modify);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return true;
@@ -486,7 +486,7 @@ public class CharacterItemManager {
CloseTradeWindowMsg closeMsg = new CloseTradeWindowMsg(source, tradeID);
dispatch = Dispatch.borrow(source, closeMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
if (!sourceTrade) {
sourceItemMan.endTrade();
@@ -601,7 +601,7 @@ public class CharacterItemManager {
return false;
}
if (this.doesCharOwnThisItem(i.getObjectUUID()) == false && this.absCharacter.getObjectType() != GameObjectType.Mob && (i.containerType != Enum.ItemContainerType.FORGE))
if (this.doesCharOwnThisItem(i.getObjectUUID()) == false && this.absCharacter.getObjectType() != GameObjectType.Mob && (i.containerType != mbEnums.ItemContainerType.FORGE))
return false;
// remove it from other lists:
@@ -632,7 +632,7 @@ public class CharacterItemManager {
synchronized (this) {
//Skip if NOT in vault.
if (item.containerType != Enum.ItemContainerType.VAULT)
if (item.containerType != mbEnums.ItemContainerType.VAULT)
if (this.doesCharOwnThisItem(item.getObjectUUID()) == false)
return false;
@@ -907,7 +907,7 @@ public class CharacterItemManager {
return false;
}
public boolean equipItem(Item i, Enum.EquipSlotType slot) {
public boolean equipItem(Item i, mbEnums.EquipSlotType slot) {
synchronized (this) {
@@ -1369,7 +1369,7 @@ public class CharacterItemManager {
return equipped.containsValue(i);
}
public synchronized Item getItemFromEquipped(Enum.EquipSlotType slot) {
public synchronized Item getItemFromEquipped(mbEnums.EquipSlotType slot) {
return equipped.get(slot);
}
@@ -1470,9 +1470,9 @@ public class CharacterItemManager {
return false;
for (Enum.EquipSlotType slot : this.equipped.keySet()) {
for (mbEnums.EquipSlotType slot : this.equipped.keySet()) {
if (slot == Enum.EquipSlotType.HAIR || slot == Enum.EquipSlotType.BEARD)
if (slot == mbEnums.EquipSlotType.HAIR || slot == mbEnums.EquipSlotType.BEARD)
continue;
Item item = this.equipped.get(slot);
@@ -1498,13 +1498,13 @@ public class CharacterItemManager {
*
* @return the equipped
*/
public ConcurrentHashMap<Enum.EquipSlotType, Item> getEquipped() {
public ConcurrentHashMap<mbEnums.EquipSlotType, Item> getEquipped() {
synchronized (this.equipped) {
return new ConcurrentHashMap<>(this.equipped);
}
}
public Item getEquipped(Enum.EquipSlotType slot) {
public Item getEquipped(mbEnums.EquipSlotType slot) {
synchronized (this.equipped) {
return this.equipped.get(slot);
}
@@ -1600,7 +1600,7 @@ public class CharacterItemManager {
//MobLoot
item.zeroItem();
item.containerType = Enum.ItemContainerType.INVENTORY;
item.containerType = mbEnums.ItemContainerType.INVENTORY;
if (item.template.item_type.equals(ItemType.GOLD))
//only add gold item once
@@ -1613,7 +1613,7 @@ public class CharacterItemManager {
item.setNumOfItems(0);
MobLoot ml = new MobLoot(this.absCharacter, amt);
ml.zeroItem();
ml.containerType = Enum.ItemContainerType.INVENTORY;
ml.containerType = mbEnums.ItemContainerType.INVENTORY;
if (!corpse.hasGold()) {
corpse.setHasGold(true);
newInventory.add(ml);
@@ -1829,11 +1829,11 @@ public class CharacterItemManager {
UpdateInventoryMsg updateInventoryMsg = new UpdateInventoryMsg(inventory, this.getBank(), this.getGoldInventory(), add);
Dispatch dispatch = Dispatch.borrow(pc, updateInventoryMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
public void forceToInventory(Enum.EquipSlotType slot, Item item, PlayerCharacter player, boolean initialized) {
public void forceToInventory(mbEnums.EquipSlotType slot, Item item, PlayerCharacter player, boolean initialized) {
if (item == null || player == null)
return;
@@ -1854,7 +1854,7 @@ public class CharacterItemManager {
if (initialized) {
TransferItemFromEquipToInventoryMsg back = new TransferItemFromEquipToInventoryMsg(player, slot);
DispatchMessage.dispatchMsgToInterestArea(player, back, engine.Enum.DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
DispatchMessage.dispatchMsgToInterestArea(player, back, mbEnums.DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
}
}
@@ -2005,7 +2005,7 @@ public class CharacterItemManager {
return;
//verify the item is equipped by this player
Enum.EquipSlotType slot = item.equipSlot;
mbEnums.EquipSlotType slot = item.equipSlot;
if (!this.equipped.containsKey(slot))
return;
@@ -2046,7 +2046,7 @@ public class CharacterItemManager {
ItemHealthUpdateMsg itemHealthUpdateMsg = new ItemHealthUpdateMsg(slot.ordinal(), (float) dur);
Dispatch dispatch = Dispatch.borrow(pc, itemHealthUpdateMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}