Skip to content

Commit 5480e5e

Browse files
committed
Add regex matching support for codex entry discovered on region
1 parent b94cb95 commit 5480e5e

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

src/main/java/cx/ajneb97/listeners/JugadorListener.java

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.ArrayList;
44
import java.util.List;
5+
import java.util.regex.Pattern;
56

67
import org.bukkit.Bukkit;
78
import org.bukkit.ChatColor;
@@ -44,16 +45,23 @@ public void alEntrarARegion(WorldGuardAPIRegionEnterEvent event) {
4445
List<EntradaCodex> entradas = categoria.getEntradas();
4546
for(final EntradaCodex entrada : entradas) {
4647
String nombreRegion = entrada.getDiscoveredOnRegion();
47-
if(nombreRegion != null && region.equals(nombreRegion)) {
48-
plugin.getJugadorDataManager().agregarEntrada(jugador, categoria.getPath(), entrada.getId(), new AgregarEntradaCallback() {
49-
@Override
50-
public void onDone(boolean agrega) {
51-
if(agrega) {
52-
plugin.getCodexManager().desbloquearEntrada(jugador, categoria, entrada);
48+
if(nombreRegion != null) {
49+
boolean matches = region.equals(nombreRegion);
50+
if (!matches && nombreRegion.length() > 2 && nombreRegion.charAt(0) == '/' && nombreRegion.charAt(nombreRegion.length() - 1) == '/') {
51+
Pattern pattern = Pattern.compile(nombreRegion.substring(1, nombreRegion.length() - 1));
52+
matches = pattern.matcher(region).matches();
53+
}
54+
if (matches) {
55+
plugin.getJugadorDataManager().agregarEntrada(jugador, categoria.getPath(), entrada.getId(), new AgregarEntradaCallback() {
56+
@Override
57+
public void onDone(boolean agrega) {
58+
if (agrega) {
59+
plugin.getCodexManager().desbloquearEntrada(jugador, categoria, entrada);
60+
}
5361
}
54-
}
55-
});
56-
return;
62+
});
63+
return;
64+
}
5765
}
5866
}
5967
}

version.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Fri Feb 23 19:01:07 EST 2024
2-
buildNumber=2
1+
#Sun Feb 25 17:03:51 EST 2024
2+
buildNumber=3

0 commit comments

Comments
 (0)