fixed Hired Merchant duplication & Store Remote Controller inventory checking#277
Open
Matan-94 wants to merge 5 commits intoP0nk:masterfrom
Open
fixed Hired Merchant duplication & Store Remote Controller inventory checking#277Matan-94 wants to merge 5 commits intoP0nk:masterfrom
Matan-94 wants to merge 5 commits intoP0nk:masterfrom
Conversation
Matan-94
changed the title
|
I recommend re-formatting your spaces formatting using intellij ctrl+alt+L and always put curly braces around conditions even if there is only 1 line of code inside to be consistent with the rest of the project. |
P0nk
requested changes
Oct 20, 2024
Owner
P0nk
left a comment
P0nk
left a comment
There was a problem hiding this comment.
Good fixes, just need some minor changes.
| chr.setHiredMerchant(merchant); | ||
| c.getWorldServer().registerHiredMerchant(merchant); | ||
| chr.sendPacket(PacketCreator.getHiredMerchant(chr, merchant, true)); | ||
| System.out.println("new shop creation."); |
Owner
There was a problem hiding this comment.
Remove println. Should use Slf4j logger if something needs to be logged. This doesn't need it though.
ak4153
reviewed
Sep 27, 2025
|
|
||
| private final Lock lock = new ReentrantLock(true);; | ||
| private final Lock lock = new ReentrantLock(true); | ||
| ; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
1. players were able to open their shop from any map using packet.
added Store Remote Controller inventory & location checking.
Steps:
1.open merchant and go any map you like.
2. send this packet:
3B 00 01 0D 00 54 30 35 30 34 32 36 37 30 32 31 38 58 01 00 00 003. merchant opened
2. players were able to duplicate their merchant across FM rooms.
Steps:
1.open merchant regularly put item and leave the shop.
2. go to other room in fm.
4.send this packet
7B 00 00 05 04 00 6C 61 6C 61 00 01 00 76 C0 4C 005. put item and open shop.
6. merchant duplicated.
Checklist before requesting a review
Screenshots