Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

More item refactor work.

Browse Source
This commit is contained in:
MagicBot
2024-03-02 10:52:20 -05:00
parent 5736f0a7a3
commit d05dbef71d
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Item.java
+2 -3
View File
@@ -50,7 +50,7 @@ public class Item extends AbstractWorldObject {
private int numberOfItems;
public float durabilityCurrent;
public int chargesRemaining;
private byte equipSlot;
public byte equipSlot;
private boolean canDestroy;
private boolean isRandom = false;
private int value;
@@ -627,11 +627,10 @@ public class Item extends AbstractWorldObject {
if (persist) {
try {
newGold = DbManager.ItemQueries.PERSIST(newGold);
DbManager.ItemQueries.ZERO_ITEM_STACK(newGold);
} catch (Exception e) {
Logger.error(e);
}
DbManager.ItemQueries.ZERO_ITEM_STACK(newGold);
}
return newGold;
src/engine/objects/PlayerCharacter.java
+15 -11
View File
@@ -1190,15 +1190,17 @@ public class PlayerCharacter extends AbstractCharacter {
}
if (hairStyleID != 0) {
// Create Hair
Item tempHair = new Item(ItemBase.getItemBase(hairStyleID), playerCharacter.getObjectUUID(), OwnerType.PlayerCharacter,
(byte) 0, (byte) 0, (short) 1, (short) 1, false, false, ItemContainerType.EQUIPPED,
(byte) MBServerStatics.SLOT_HAIRSTYLE, new ArrayList<>(), "");
Item hair;
// Create Hair
Item hair = new Item(hairStyleID);
hair.ownerID = playerCharacter.getObjectUUID();
hair.ownerType = OwnerType.PlayerCharacter;
hair.containerType = ItemContainerType.EQUIPPED;
hair.equipSlot = (byte) MBServerStatics.SLOT_HAIRSTYLE;
try {
hair = DbManager.ItemQueries.PERSIST(tempHair);
hair = DbManager.ItemQueries.PERSIST(hair);
} catch (Exception e) {
hair = null;
}
@@ -1213,12 +1215,14 @@ public class PlayerCharacter extends AbstractCharacter {
if (beardStyleID != 0) {
// Create Beard
Item tempBeard = new Item(ItemBase.getItemBase(beardStyleID), playerCharacter.getObjectUUID(), OwnerType.PlayerCharacter,
(byte) 0, (byte) 0, (short) 1, (short) 1, false, false, ItemContainerType.EQUIPPED,
(byte) MBServerStatics.SLOT_BEARDSTYLE, new ArrayList<>(), "");
Item beard;
Item beard = new Item(hairStyleID);
beard.ownerID = playerCharacter.getObjectUUID();
beard.ownerType = OwnerType.PlayerCharacter;
beard.containerType = ItemContainerType.EQUIPPED;
beard.equipSlot = (byte) MBServerStatics.SLOT_BEARDSTYLE;
try {
beard = DbManager.ItemQueries.PERSIST(tempBeard);
beard = DbManager.ItemQueries.PERSIST(beard);
} catch (Exception e) {
beard = null;
}