Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleTrade

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:53:53 +02:00
parent 701d735202
commit 5883626020
10 changed files with 118 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/server/maps/HiredMerchant.java
View File

@@ -36,7 +36,7 @@ import net.server.Server;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import server.ItemInformationProvider;
import server.MapleTrade;
import server.Trade;
import tools.DatabaseConnection;
import tools.PacketCreator;
import tools.Pair;
@@ -279,7 +279,7 @@ public class HiredMerchant extends AbstractMapObject {
if (c.getPlayer().getMeso() >= price) {
if (canBuy(c, newItem)) {
c.getPlayer().gainMeso(-price, false);
price -= MapleTrade.getFee(price); // thanks BHB for pointing out trade fees not applying here
price -= Trade.getFee(price); // thanks BHB for pointing out trade fees not applying here
synchronized (sold) {
sold.add(new SoldItem(c.getPlayer().getName(), pItem.getItem().getItemId(), newItem.getQuantity(), price));