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

Store merchant visitor history, and display it in the dialogue

Browse Source
This commit is contained in:
P0nk
2021-09-28 08:33:25 +02:00
parent cc23d7734a
commit 3a9305d0d9
3 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java
View File

@@ -312,8 +312,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
} else {
chr.sendPacket(PacketCreator.getMiniRoomError(22));
}
} else if (ob instanceof HiredMerchant && chr.getHiredMerchant() == null) {
HiredMerchant merchant = (HiredMerchant) ob;
} else if (ob instanceof HiredMerchant merchant && chr.getHiredMerchant() == null) {
merchant.visitShop(chr);
}
}
@@ -686,9 +685,11 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
merchant.withdrawMesos(chr);
} else if (mode == Action.VIEW_VISITORS.getCode()) {
List<String> visitorNames = List.of("Dwayne", "Ruben", "Ada", "Clifton", "Beatrice", "Kent", "Max",
"Cecelia", "Edward", "Cory");
c.sendPacket(PacketCreator.viewMerchantVisitors(visitorNames));
HiredMerchant merchant = chr.getHiredMerchant();
if (merchant == null || !merchant.isOwner(chr)) {
return;
}
c.sendPacket(PacketCreator.viewMerchantVisitorHistory(merchant.getVisitorHistory()));
} else if (mode == Action.VIEW_BLACKLIST.getCode()) {
List<String> blacklistedNames = List.of("Blanca", "Betsy", "Kevin", "Rosa", "Evan", "Terence",
"Cecilia", "Gayle", "Erma", "Dorothy", "Willis", "Alberta", "Marilyn", "Myron", "Sheryl",