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

Hired Merchant & Player shop fixes + Owl of Minerva

Browse Source 
Thanks to BenjixD DietStory's dev team, many bugs found by them have
been patched (pirate quests, missing drop data, fly command, etc).
Implemented Owl of Minerva. Fixed many issues with Hired Merchant and
Player Shops. Fixed an error with the slot checking system. Added Wish
Tickets (circa-2006 GMS event) to be dropped on AmoriaPQ.
This commit is contained in:
ronancpl
2017-09-29 18:35:42 -03:00
parent de7e686a92
commit ddbd679f88
129 changed files with 4564 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/net/server/channel/handlers/OwlWarpHandler.java Normal file
View File

@@ -0,0 +1,106 @@
/*
This file is part of the OdinMS Maple Story Server
Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
Matthias Butz <matze@odinms.de>
Jan Christian Meyer <vimes@odinms.de>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation version 3 as published by
the Free Software Foundation. You may not use, modify or distribute
this program under any other version of the GNU Affero General Public
License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.handlers;
import constants.GameConstants;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import server.MaplePlayerShop;
import server.maps.MapleHiredMerchant;
import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/*
* @author Ronan
*/
public final class OwlWarpHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
int ownerid = slea.readInt();
int mapid = slea.readInt();
MapleHiredMerchant hm = c.getWorldServer().getHiredMerchant(ownerid); // if both hired merchant and player shop is on the same map
MaplePlayerShop ps;
if(hm == null || hm.getMapId() != mapid || !hm.hasItem(c.getPlayer().getOwlSearch())) {
ps = c.getWorldServer().getPlayerShop(ownerid);
if(ps == null || ps.getMapId() != mapid || !ps.hasItem(c.getPlayer().getOwlSearch())) {
if(hm == null && ps == null) c.announce(MaplePacketCreator.getOwlMessage(1));
else c.announce(MaplePacketCreator.getOwlMessage(3));
return;
}
if(ps.isOpen()) {
if(GameConstants.isFreeMarketRoom(mapid)) {
if(ps.getChannel() == c.getChannel()) {
c.getPlayer().changeMap(mapid);
if(ps.isOpen()) { //change map has a delay, must double check
if(!ps.visitShop(c.getPlayer())) {
if(!ps.isBanned(c.getPlayer().getName())) c.announce(MaplePacketCreator.getOwlMessage(2));
else c.announce(MaplePacketCreator.getOwlMessage(17));
}
} else {
//c.announce(MaplePacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance."));
c.announce(MaplePacketCreator.getOwlMessage(18));
}
} else {
c.announce(MaplePacketCreator.serverNotice(1, "That shop is currently located in another channel. Current location: Channel " + hm.getChannel() + ", '" + hm.getMap().getMapName() + "'."));
}
} else {
c.announce(MaplePacketCreator.serverNotice(1, "That shop is currently located outside of the FM area. Current location: Channel " + hm.getChannel() + ", '" + hm.getMap().getMapName() + "'."));
}
} else {
//c.announce(MaplePacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance."));
c.announce(MaplePacketCreator.getOwlMessage(18));
}
} else {
if(hm.isOpen()) {
if(GameConstants.isFreeMarketRoom(mapid)) {
if(hm.getChannel() == c.getChannel()) {
c.getPlayer().changeMap(mapid);
if(hm.isOpen()) { //change map has a delay, must double check
if(hm.addVisitor(c.getPlayer())) {
c.announce(MaplePacketCreator.getHiredMerchant(c.getPlayer(), hm, false));
c.getPlayer().setHiredMerchant(hm);
} else {
//c.announce(MaplePacketCreator.serverNotice(1, hm.getOwner() + "'s merchant is full. Wait awhile before trying again."));
c.announce(MaplePacketCreator.getOwlMessage(2));
}
} else {
//c.announce(MaplePacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance."));
c.announce(MaplePacketCreator.getOwlMessage(18));
}
} else {
c.announce(MaplePacketCreator.serverNotice(1, "That merchant is currently located in another channel. Current location: Channel " + hm.getChannel() + ", '" + hm.getMap().getMapName() + "'."));
}
} else {
c.announce(MaplePacketCreator.serverNotice(1, "That merchant is currently located outside of the FM area. Current location: Channel " + hm.getChannel() + ", '" + hm.getMap().getMapName() + "'."));
}
} else {
//c.announce(MaplePacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance."));
c.announce(MaplePacketCreator.getOwlMessage(18));
}
}
}
}