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

Rename and clean up MapleHiredMerchant

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:22:34 +02:00
parent 897f2a857f
commit d35969dea5
9 changed files with 142 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/server/channel/handlers/RemoteStoreHandler.java
View File

@@ -26,7 +26,7 @@ import client.Character;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.MapleHiredMerchant;
import server.maps.HiredMerchant;
import tools.PacketCreator;
/**
@@ -37,7 +37,7 @@ public class RemoteStoreHandler extends AbstractPacketHandler {
@Override
public void handlePacket(InPacket p, Client c) {
Character chr = c.getPlayer();
MapleHiredMerchant hm = getMerchant(c);
HiredMerchant hm = getMerchant(c);
if (hm != null && hm.isOwner(chr)) {
if (hm.getChannel() == chr.getClient().getChannel()) {
hm.visitShop(chr);
@@ -51,7 +51,7 @@ public class RemoteStoreHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.enableActions());
}
private static MapleHiredMerchant getMerchant(Client c) {
private static HiredMerchant getMerchant(Client c) {
if (c.getPlayer().hasMerchant()) {
return c.getWorldServer().getHiredMerchant(c.getPlayer().getId());
}