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

Maker & Storage fetch Wz + Buff system & PS / HM patch + Pet Evolution

Browse Source 
Storage now fetches transaction fees from the WZ.
Maker now pulls info about catalyzers from the WZ.
Fixed the enhanced buff system disappearing with some statsup when using multiple-statups items.
Fixed hired merchant now removing owner and visitors at expiration time.
Fixed some concurrent issues with player shops and hired merchants.
Fixed pet evolutions, now not only handing out not-expired pets but also refreshing the expire time as well.
Added item replace behaviour on the item expire system.
This commit is contained in:
ronancpl
2018-06-07 12:57:56 -03:00
parent ce74680953
commit cdac59326a
22 changed files with 486 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/net/server/channel/handlers/PlayerInteractionHandler.java
View File

@@ -240,21 +240,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
}
} else if (ob instanceof MapleHiredMerchant && chr.getHiredMerchant() == null) {
MapleHiredMerchant merchant = (MapleHiredMerchant) ob;
if (merchant.isOwner(chr)) {
merchant.setOpen(false);
merchant.removeAllVisitors();
c.announce(MaplePacketCreator.getHiredMerchant(chr, merchant, false));
} else if (!merchant.isOpen()) {
chr.getClient().announce(MaplePacketCreator.getMiniRoomError(18));
return;
} else if (!merchant.addVisitor(chr)) {
chr.getClient().announce(MaplePacketCreator.getMiniRoomError(2));
return;
} else {
c.announce(MaplePacketCreator.getHiredMerchant(chr, merchant, false));
}
chr.setHiredMerchant(merchant);
merchant.visitShop(chr);
}
}
} else if (mode == Action.CHAT.getCode()) { // chat lol
@@ -527,10 +513,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
merchant.clearInexistentItems();
if (merchant.getItems().isEmpty()) {
c.announce(MaplePacketCreator.hiredMerchantOwnerLeave());
c.announce(MaplePacketCreator.leaveHiredMerchant(0x00, 0x03));
merchant.closeShop(c, false);
chr.setHasMerchant(false);
merchant.closeOwnerMerchant(chr);
return;
}
c.announce(MaplePacketCreator.updateHiredMerchant(merchant, chr));
@@ -579,11 +562,8 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
if (isTradeOpen(chr)) return;
MapleHiredMerchant merchant = chr.getHiredMerchant();
if (merchant != null && merchant.isOwner(chr)) {
c.announce(MaplePacketCreator.hiredMerchantOwnerLeave());
c.announce(MaplePacketCreator.leaveHiredMerchant(0x00, 0x03));
merchant.closeShop(c, false);
chr.setHasMerchant(false);
if (merchant != null) {
merchant.closeOwnerMerchant(chr);
}
} else if (mode == Action.MAINTENANCE_OFF.getCode()) {
if (isTradeOpen(chr)) return;