Skip to content

Reference world by name instead of object #348

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
Combustible merged 3 commits into from
May 7, 2026
Merged

Reference world by name instead of object #348

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
566b5c9
Reference world by name instead of object
NickNackGus May 2, 2026
10cf8e5
Corrected warning about handling unloaded worlds; added exception pur…
NickNackGus May 2, 2026
d1f95e6
Upgraded severity to severe so exception logger will catch it
Combustible May 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
13 changes: 8 additions & 5 deletions plugin/src/main/java/com/playmonumenta/scriptedquests/utils/WorldRegexMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

public class WorldRegexMatcher {
private final Map<String, Pattern> mPatterns = new HashMap<>();
private final Map<World, Set<String>> mWorldPatternMatches = new HashMap<>();
private final Map<String, Set<String>> mWorldPatternMatches = new HashMap<>();

public WorldRegexMatcher(Set<String> worldRegexes) throws PatternSyntaxException {
for (String worldRegexStr : worldRegexes) {
Expand All @@ -25,7 +25,7 @@ public WorldRegexMatcher(Set<String> worldRegexes) throws PatternSyntaxException

public void onLoadWorld(World world) {
Set<String> matchingPatterns = new HashSet<>();
mWorldPatternMatches.put(world, matchingPatterns);
mWorldPatternMatches.put(world.getName(), matchingPatterns);

String worldName = world.getName();
for (Map.Entry<String, Pattern> entry : mPatterns.entrySet()) {
Expand All @@ -42,14 +42,17 @@ public void onLoadWorld(World world) {
}

public void onUnloadWorld(World world) {
mWorldPatternMatches.remove(world);
mWorldPatternMatches.remove(world.getName());
}

// Only works for the patterns provided at matcher instantiation
public boolean matches(World world, String worldRegex) {
Set<String> matches = mWorldPatternMatches.get(world);
Set<String> matches = mWorldPatternMatches.get(world.getName());
if (matches == null) {
MMLog.warning("Falling back to slow regex .matches() to test world: '" + world.getName() + "' against unregistered regex: '" + worldRegex + "'");
MMLog.severe(
"Falling back to slow regex .matches() to test unloaded world: '" + world.getName() + "' against regex: '" + worldRegex + "'",
new IllegalStateException("WorldRegexMatcher testing against an unloaded world")
);
try {
return world.getName().matches(worldRegex);
} catch (PatternSyntaxException e) {
Expand Down
Loading