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

Remove "Maple" prefix from MaplePacketCreator name

Browse Source
This commit is contained in:
P0nk
2021-08-19 21:31:57 +02:00
parent 579e3c639f
commit e184f25184
307 changed files with 2285 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/server/MapleTrade.java
View File

@@ -21,27 +21,27 @@
*/
package server;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import config.YamlConfig;
import tools.LogHelper;
import tools.MaplePacketCreator;
import client.MapleCharacter;
import client.inventory.Item;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import client.inventory.manipulator.MapleKarmaManipulator;
import config.YamlConfig;
import constants.game.GameConstants;
import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteResult;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult;
import tools.LogHelper;
import tools.PacketCreator;
import tools.Pair;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
/**
*
* @author Matze
@@ -104,7 +104,7 @@ public class MapleTrade {
private void lockTrade() {
locked.set(true);
partner.getChr().getClient().announce(MaplePacketCreator.getTradeConfirmation());
partner.getChr().getClient().announce(PacketCreator.getTradeConfirmation());
}
private void fetchExchangedItems() {
@@ -143,7 +143,7 @@ public class MapleTrade {
exchangeItems.clear();
}
chr.getClient().announce(MaplePacketCreator.getTradeResult(number, result));
chr.getClient().announce(PacketCreator.getTradeResult(number, result));
}
private void cancel(byte result) {
@@ -164,7 +164,7 @@ public class MapleTrade {
exchangeItems.clear();
}
chr.getClient().announce(MaplePacketCreator.getTradeResult(number, result));
chr.getClient().announce(PacketCreator.getTradeResult(number, result));
}
private boolean isLocked() {
@@ -186,9 +186,9 @@ public class MapleTrade {
if (chr.getMeso() >= meso) {
chr.gainMeso(-meso, false, true, false);
this.meso += meso;
chr.getClient().announce(MaplePacketCreator.getTradeMesoSet((byte) 0, this.meso));
chr.getClient().announce(PacketCreator.getTradeMesoSet((byte) 0, this.meso));
if (partner != null) {
partner.getChr().getClient().announce(MaplePacketCreator.getTradeMesoSet((byte) 1, this.meso));
partner.getChr().getClient().announce(PacketCreator.getTradeMesoSet((byte) 1, this.meso));
}
} else {
}
@@ -212,9 +212,9 @@ public class MapleTrade {
}
public void chat(String message) {
chr.getClient().announce(MaplePacketCreator.getTradeChat(chr, message, true));
chr.getClient().announce(PacketCreator.getTradeChat(chr, message, true));
if (partner != null) {
partner.getChr().getClient().announce(MaplePacketCreator.getTradeChat(chr, message, false));
partner.getChr().getClient().announce(PacketCreator.getTradeChat(chr, message, false));
}
}
@@ -334,7 +334,7 @@ public class MapleTrade {
if (local.getChr().getLevel() < 15) {
if (local.getChr().getMesosTraded() + local.exchangeMeso > 1000000) {
cancelTrade(local.getChr(), TradeResult.NO_RESPONSE);
local.getChr().getClient().announce(MaplePacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day."));
local.getChr().getClient().announce(PacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day."));
return;
} else {
local.getChr().addMesosTraded(local.exchangeMeso);
@@ -342,7 +342,7 @@ public class MapleTrade {
} else if (partner.getChr().getLevel() < 15) {
if (partner.getChr().getMesosTraded() + partner.exchangeMeso > 1000000) {
cancelTrade(partner.getChr(), TradeResult.NO_RESPONSE);
partner.getChr().getClient().announce(MaplePacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day."));
partner.getChr().getClient().announce(PacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day."));
return;
} else {
partner.getChr().addMesosTraded(partner.exchangeMeso);
@@ -463,8 +463,8 @@ public class MapleTrade {
c2.getTrade().setPartner(c1.getTrade());
c1.getTrade().setPartner(c2.getTrade());
c1.getClient().announce(MaplePacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 0));
c2.getClient().announce(MaplePacketCreator.tradeInvite(c1));
c1.getClient().announce(PacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 0));
c2.getClient().announce(PacketCreator.tradeInvite(c1));
} else {
c1.message("The other player is already trading with someone else.");
cancelTrade(c1, TradeResult.NO_RESPONSE);
@@ -482,8 +482,8 @@ public class MapleTrade {
InviteResult res = inviteRes.result;
if (res == InviteResult.ACCEPTED) {
if (c1.getTrade() != null && c1.getTrade().getPartner() == c2.getTrade() && c2.getTrade() != null && c2.getTrade().getPartner() == c1.getTrade()) {
c2.getClient().announce(MaplePacketCreator.getTradePartnerAdd(c1));
c1.getClient().announce(MaplePacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 1));
c2.getClient().announce(PacketCreator.getTradePartnerAdd(c1));
c1.getClient().announce(PacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 1));
c1.getTrade().setFullTrade(true);
c2.getTrade().setFullTrade(true);
} else {