Sweetgum/sweetgum-server
1
1
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

23
src/main/java/net/server/channel/handlers/HiredMerchantRequest.java
View File

@@ -21,21 +21,22 @@
*/
package net.server.channel.handlers;
import client.inventory.ItemFactory;
import client.MapleCharacter;
import java.sql.SQLException;
import java.util.Arrays;
import client.MapleClient;
import client.inventory.ItemFactory;
import constants.game.GameConstants;
import java.awt.Point;
import net.AbstractMaplePacketHandler;
import server.maps.MaplePortal;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import server.maps.MaplePlayerShop;
import tools.MaplePacketCreator;
import server.maps.MaplePortal;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.awt.*;
import java.sql.SQLException;
import java.util.Arrays;
/**
*
* @author XoticStory
@@ -52,11 +53,11 @@ public final class HiredMerchantRequest extends AbstractMaplePacketHandler {
MaplePlayerShop shop = mc.getPlayerShop();
if (shop != null && shop.isOwner(mc)) {
chr.announce(MaplePacketCreator.getMiniRoomError(13));
chr.announce(PacketCreator.getMiniRoomError(13));
return;
}
} else {
chr.announce(MaplePacketCreator.getMiniRoomError(13));
chr.announce(PacketCreator.getMiniRoomError(13));
return;
}
}
@@ -64,7 +65,7 @@ public final class HiredMerchantRequest extends AbstractMaplePacketHandler {
Point cpos = chr.getPosition();
MaplePortal portal = chr.getMap().findClosestTeleportPortal(cpos);
if (portal != null && portal.getPosition().distance(cpos) < 120.0) {
chr.announce(MaplePacketCreator.getMiniRoomError(10));
chr.announce(PacketCreator.getMiniRoomError(10));
return;
}
} catch (Exception e) {
@@ -75,9 +76,9 @@ public final class HiredMerchantRequest extends AbstractMaplePacketHandler {
if (!chr.hasMerchant()) {
try {
if (ItemFactory.MERCHANT.loadItems(chr.getId(), false).isEmpty() && chr.getMerchantMeso() == 0) {
c.announce(MaplePacketCreator.hiredMerchantBox());
c.announce(PacketCreator.hiredMerchantBox());
} else {
chr.announce(MaplePacketCreator.retrieveFirstMessage());
chr.announce(PacketCreator.retrieveFirstMessage());
}
} catch (SQLException ex) {
ex.printStackTrace();