forked from MagicBane/Server
removed siegeminion map from NPC
This commit is contained in:
@@ -513,7 +513,11 @@ public class Mob extends AbstractIntelligenceAgent {
|
|||||||
|
|
||||||
Mob siegeMinion;
|
Mob siegeMinion;
|
||||||
|
|
||||||
if (artyCaptain.getSiegeMinionMap().size() == 3)
|
int maxSlots = 1;
|
||||||
|
if(artyCaptain.getContractID() == 839)//artillery captain for bulwark
|
||||||
|
maxSlots = 3;
|
||||||
|
|
||||||
|
if (artyCaptain.getSiegeMinionMap().size() == maxSlots)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
siegeMinion = new Mob();
|
siegeMinion = new Mob();
|
||||||
|
|||||||
@@ -50,7 +50,6 @@ public class NPC extends AbstractCharacter {
|
|||||||
// Used for thread safety
|
// Used for thread safety
|
||||||
public final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
|
public final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
|
||||||
private final ArrayList<MobLoot> rolling = new ArrayList<>();
|
private final ArrayList<MobLoot> rolling = new ArrayList<>();
|
||||||
private final ConcurrentHashMap<Mob, Integer> siegeMinionMap = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
|
|
||||||
public ReentrantReadWriteLock minionLock = new ReentrantReadWriteLock();
|
public ReentrantReadWriteLock minionLock = new ReentrantReadWriteLock();
|
||||||
public ArrayList<ProducedItem> forgedItems = new ArrayList<>();
|
public ArrayList<ProducedItem> forgedItems = new ArrayList<>();
|
||||||
public HashMap<Integer, MobEquipment> equip = null;
|
public HashMap<Integer, MobEquipment> equip = null;
|
||||||
|
|||||||
Reference in New Issue
Block a user