2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-20 21:40:27 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Badhad 2021-04-05 21:23:30 -04:00
commit 9670308931
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Server/src/main/java/core/game/content/global/shop/Shop.java
View file

@ -605,13 +605,13 @@ public class Shop {
item = new Item(item.getNoteChange(), item.getAmount()); item = new Item(item.getNoteChange(), item.getAmount());
} }
int amount = getContainer(1).getAmount(item); int amount = getContainer(1).getAmount(item);
if (getCurrency() == TOKKUL) { /*if (getCurrency() == TOKKUL) {
for (Item i : items) { for (Item i : items) {
if (i.getId() == item.getId()) { if (i.getId() == item.getId()) {
amount = i.getAmount(); amount = i.getAmount();
} }
} }
} }*/
if (amount < 1) { if (amount < 1) {
amount = getContainer(0).getAmount(item); amount = getContainer(0).getAmount(item);
} }
@ -621,6 +621,7 @@ public class Shop {
if (tokkul > 0) { if (tokkul > 0) {
value = tokkul /= 10; value = tokkul /= 10;
} }
value = value * item.getAmount();
} }
return value; return value;
} }