MagicBane
/
Server
92
0
Fork 2
Code Issues 13 Pull Requests Projects Releases Wiki Activity
Browse Source

remove ItemBase from NPC

combat-2
FatBoy-DOTC 8 months ago
parent
3ff9115052
commit
ce7b9ff96f
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/engine/objects/NPC.java

10
src/engine/objects/NPC.java
Unescape View File

@ -1064,11 +1064,11 @@ public class NPC extends AbstractCharacter {
maxSkill = 110; maxSkill = 110;
break; break;
} }
ItemTemplate itemBase; ItemTemplate itemTemplate;
for (Integer itemID : fullItemList) { for (Integer itemID : fullItemList) {
itemBase = ItemTemplate.templates.get(itemID); itemTemplate = ItemTemplate.templates.get(itemID);
boolean exclude = (int)itemBase.item_skill_required.values().toArray()[0] == 0 && ItemTemplate.templates.get(itemID).item_type == ItemType.WEAPON; boolean exclude = (int)itemTemplate.item_skill_required.values().toArray()[0] == 0 && ItemTemplate.templates.get(itemID).item_type == ItemType.WEAPON;
if ((int)itemBase.item_skill_required.values().toArray()[0] <= maxSkill && !exclude) if ((int)itemTemplate.item_skill_required.values().toArray()[0] <= maxSkill && !exclude)
filteredItemList.add(itemID); filteredItemList.add(itemID);
} }
if (this.contract.getVendorID() == 102) { if (this.contract.getVendorID() == 102) {
@ -1087,7 +1087,7 @@ public class NPC extends AbstractCharacter {
public int getRollingTimeInSeconds(int itemID) { public int getRollingTimeInSeconds(int itemID) {
ItemBase ib = ItemBase.getItemBase(itemID); ItemTemplate ib = ItemTemplate.templates.get(itemID);
if (ib == null) if (ib == null)
return 0; return 0;

Write Preview
Loading…
Cancel
Save