forked from MagicBane/Server
lastNegativeId moved to ItemManager
This commit is contained in:
@@ -10,6 +10,7 @@
|
||||
package engine.objects;
|
||||
|
||||
import engine.gameManager.DbManager;
|
||||
import engine.gameManager.ItemManager;
|
||||
import engine.gameManager.LootManager;
|
||||
import engine.loot.BootySetEntry;
|
||||
import engine.mbEnums;
|
||||
@@ -126,7 +127,7 @@ public class MobBase extends AbstractGameObject {
|
||||
for (BootySetEntry equipmentSetEntry : equipList) {
|
||||
|
||||
Item item = new Item(equipmentSetEntry.templateID);
|
||||
item.objectUUID = MobLoot.lastNegativeID.decrementAndGet();
|
||||
item.objectUUID = ItemManager.lastNegativeID.decrementAndGet();
|
||||
item.drop_chance = equipmentSetEntry.dropChance;
|
||||
item.equipSlot = item.template.item_eq_slots_or.iterator().next();
|
||||
equip.put(item.equipSlot, item);
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
package engine.objects;
|
||||
|
||||
import engine.gameManager.DbManager;
|
||||
import engine.gameManager.ItemManager;
|
||||
import engine.gameManager.PowersManager;
|
||||
import engine.mbEnums;
|
||||
import engine.mbEnums.ItemType;
|
||||
@@ -17,8 +18,6 @@ import engine.mbEnums.OwnerType;
|
||||
import engine.powers.poweractions.AbstractPowerAction;
|
||||
import org.pmw.tinylog.Logger;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
/**
|
||||
* An immutable, non-persistant implementation of Item
|
||||
*
|
||||
@@ -26,8 +25,6 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||
*/
|
||||
public final class MobLoot extends Item {
|
||||
|
||||
public static final AtomicInteger lastNegativeID = new AtomicInteger(0);
|
||||
|
||||
private boolean isDeleted = false;
|
||||
private boolean noSteal;
|
||||
private String prefix = "";
|
||||
@@ -77,7 +74,7 @@ public final class MobLoot extends Item {
|
||||
* @return Id number
|
||||
*/
|
||||
private static int generateId() {
|
||||
int id = lastNegativeID.decrementAndGet();
|
||||
int id = ItemManager.lastNegativeID.decrementAndGet();
|
||||
|
||||
//TODO Add a way to reclaim disposed IDs if this becomes a problem
|
||||
if (id == (-10000))
|
||||
|
||||
Reference in New Issue
Block a user