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

Itembase refactored out of gold

Browse Source
This commit is contained in:
MagicBot
2024-03-28 05:34:50 -04:00
parent 08f0fc1743
commit 1cf9831e20
3 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Account.java
+1 -1
View File
@@ -182,7 +182,7 @@ public class Account extends AbstractGameObject {
}
if (this.vaultGold == null) {
this.vaultGold = Item.newGoldItem(this.getObjectUUID(), ItemBase.getItemBase(7), ItemContainerType.VAULT);
this.vaultGold = Item.newGoldItem(this.getObjectUUID(), ItemContainerType.VAULT);
if (this.vaultGold != null)
this.vault.add(this.vaultGold);
src/engine/objects/CharacterItemManager.java
+2 -2
View File
@@ -87,14 +87,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, ItemBase.getItemBase(7), Enum.ItemContainerType.INVENTORY);
this.goldInventory = Item.newGoldItem(this.absCharacter, Enum.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, ItemBase.getItemBase(7), Enum.ItemContainerType.BANK);
this.goldBank = Item.newGoldItem(this.absCharacter, Enum.ItemContainerType.BANK);
else
this.goldBank = new MobLoot(this.absCharacter, 0);
src/engine/objects/Item.java
+8 -23
View File
@@ -539,16 +539,16 @@ public class Item extends AbstractWorldObject {
return (Item) DbManager.getFromCache(GameObjectType.Item, id);
}
public static Item newGoldItem(AbstractWorldObject awo, ItemBase ib, Enum.ItemContainerType containerType) {
return newGoldItem(awo, ib, containerType, true);
public static Item newGoldItem(AbstractWorldObject awo, Enum.ItemContainerType containerType) {
return newGoldItem(awo, containerType, true);
}
//used for vault!
public static Item newGoldItem(int accountID, ItemBase ib, Enum.ItemContainerType containerType) {
return newGoldItem(accountID, ib, containerType, true);
public static Item newGoldItem(int accountID, Enum.ItemContainerType containerType) {
return newGoldItem(accountID, containerType, true);
}
private static Item newGoldItem(int accountID, ItemBase ib, Enum.ItemContainerType containerType, boolean persist) {
private static Item newGoldItem(int accountID, Enum.ItemContainerType containerType, boolean persist) {
int ownerID;
OwnerType ownerType;
@@ -556,7 +556,7 @@ public class Item extends AbstractWorldObject {
ownerID = accountID;
ownerType = OwnerType.Account;
Item newGold = new Item(ib.getUUID());
Item newGold = new Item(ResourceType.GOLD.templateID);
newGold.ownerID = ownerID;
newGold.ownerType = ownerType;
newGold.containerType = containerType;
@@ -574,7 +574,7 @@ public class Item extends AbstractWorldObject {
return newGold;
}
private static Item newGoldItem(AbstractWorldObject awo, ItemBase ib, Enum.ItemContainerType containerType, boolean persist) {
private static Item newGoldItem(AbstractWorldObject awo, Enum.ItemContainerType containerType, boolean persist) {
int ownerID;
OwnerType ownerType;
@@ -610,7 +610,7 @@ public class Item extends AbstractWorldObject {
}
}
Item newGold = new Item(ib.getUUID());
Item newGold = new Item(ResourceType.GOLD.templateID);
newGold.ownerID = ownerID;
newGold.ownerType = ownerType;
newGold.containerType = containerType;
@@ -628,21 +628,6 @@ public class Item extends AbstractWorldObject {
return newGold;
}
// This is to be used for trades - the new item is not stored in the database
public static Item newGoldItemTemp(AbstractWorldObject awo, ItemBase ib) {
return Item.newGoldItem(awo, ib, Enum.ItemContainerType.NONE, false);
}
public static Item getItem(int UUID) {
if (UUID == 0)
return null;
Item item = (Item) DbManager.getFromCache(GameObjectType.Item, UUID);
if (item != null)
return item;
return DbManager.ItemQueries.GET_ITEM(UUID);
}
public static void addEnchantValue(String enchant, int value) {
Item.enchantValues.put(enchant, value);
}