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

10
src/main/java/client/Character.java
View File

@@ -167,7 +167,7 @@ public class Character extends AbstractCharacterObject {
private Shop shop = null;
private SkinColor skinColor = SkinColor.NORMAL;
private Storage storage = null;
private MapleTrade trade = null;
private Trade trade = null;
private MonsterBook monsterbook;
private CashShop cashshop;
private final Set<NewYearCardRecord> newyears = new LinkedHashSet<>();
@@ -1676,7 +1676,7 @@ public class Character extends AbstractCharacterObject {
this.unregisterChairBuff();
this.clearBanishPlayerData();
MapleTrade.cancelTrade(this, MapleTrade.TradeResult.UNSUCCESSFUL_ANOTHER_MAP);
Trade.cancelTrade(this, Trade.TradeResult.UNSUCCESSFUL_ANOTHER_MAP);
this.closePlayerInteractions();
Party e = null;
@@ -5532,7 +5532,7 @@ public class Character extends AbstractCharacterObject {
}
public void closeTrade() {
MapleTrade.cancelTrade(this, MapleTrade.TradeResult.PARTNER_CANCEL);
Trade.cancelTrade(this, Trade.TradeResult.PARTNER_CANCEL);
}
public void closePlayerShop() {
@@ -5887,7 +5887,7 @@ public class Character extends AbstractCharacterObject {
return summons.containsValue(summon);
}
public MapleTrade getTrade() {
public Trade getTrade() {
return trade;
}
@@ -9574,7 +9574,7 @@ public class Character extends AbstractCharacterObject {
slots = slotid;
}
public void setTrade(MapleTrade trade) {
public void setTrade(Trade trade) {
this.trade = trade;
}

4
src/main/java/client/processor/npc/DueyProcessor.java
View File

@@ -37,7 +37,7 @@ import constants.inventory.ItemConstants;
import net.server.channel.Channel;
import server.DueyPackage;
import server.ItemInformationProvider;
import server.MapleTrade;
import server.Trade;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.PacketCreator;
@@ -281,7 +281,7 @@ public class DueyProcessor {
public static void dueySendItem(Client c, byte invTypeId, short itemPos, short amount, int sendMesos, String sendMessage, String recipient, boolean quick) {
if (c.tryacquireClient()) {
try {
int fee = MapleTrade.getFee(sendMesos);
int fee = Trade.getFee(sendMesos);
if (!quick) {
fee += 5000;
} else if (!c.getPlayer().haveItem(5330000)) {