Skip to content

bugfix/black-market-pattern-incomplete #447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rettichlp merged 2 commits into from
Jun 7, 2026
+7 −1
Merged

bugfix/black-market-pattern-incomplete #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
065e1cd
Simplify black market dealer entry pattern in `BadFactionListener`
rettichlp Jun 7, 2026
6c1e3ff
Add check to prevent redundant notifications for dealer positions in …
rettichlp Jun 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/de/rettichlp/ucutils/listener/impl/faction/BadFactionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@UCUtilsListener
public class BadFactionListener implements IMessageReceiveListener {

private static final Pattern BLACK_MARKET_DEALER_ENTRY_PATTERN = compile("^» (?<location>.+) – (gerade eben|vor \\d+ min|vor \\d+ std) {2}\\[Navi]$");
private static final Pattern BLACK_MARKET_DEALER_ENTRY_PATTERN = compile("^» (?<location>.+) – (gerade eben|vor \\d+ \\w+) {2}\\[Navi]$");

@Override
public boolean onMessageReceive(Text text, String message) {
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/de/rettichlp/ucutils/mixin/ClientPlayNetworkHandlerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ private void onEntityTrackerUpdate(EntityTrackerUpdateS2CPacket packet, Callback

String customNameString = requireNonNull(villager.getCustomName()).getString();
Vec3d entityPos = villager.getEntityPos();

// already notified check
if (entityPos.equals(storage.getDealerPosition()) || entityPos.equals(storage.getBlackMarketPosition())) {
return;
}

switch (customNameString) {
case "Dealer" -> {
storage.setBlackMarketPosition(entityPos);
Expand Down