Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/build/
/run/
/.idea/
/bin/
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ Minecraft self-service teleport requests
| `/tpa <NAME>` | `tpask` | Send request | `tpa.tpa` |
| `/tpy <NAME>` | `tpaccept`, `tpyes` | Accept request | `tpa.tpy` |
| `/tpn <NAME>` | `tpdeny`, `tpno` | Deny request | `tpa.tpn` |
| `/tpi [<NAME>]` | `tpignore` | Ignore requests per player | `tpa.tpi` |
| `/tpi <NAME>` | `tpignore` | Ignore requests per player | `tpa.tpi` |
| `/tpt` | `tptoggle` | Ignore requests globally | `tpa.tpt` |
| `/tpc <NAME>` | `tpcancel` | Cancel outgoing requests | `tpa.tpc` |

## Statistics

Expand Down
17 changes: 13 additions & 4 deletions src/main/java/lol/hub/hubtp/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ public final class Config {
private static boolean movementCheck;
private static boolean includeLeashed;
private static boolean includeLeashedInterdimensional;
private static boolean teleportMountedEntities;
private static Path ignoresPath;
private static boolean debug;

private static synchronized void assertInitialized() {
if (!initialized) throw new IllegalStateException("Config access prior to initialization!");
if (!initialized)
throw new IllegalStateException("Config access prior to initialization!");
}

public static synchronized void load(Plugin plugin) {
Expand All @@ -37,13 +39,13 @@ public static synchronized void load(Plugin plugin) {
config.addDefault("movement-check", false);
config.addDefault("include-leashed", true);
config.addDefault("include-leashed-interdimensional", false);
config.addDefault("teleport-mounted-entities", true);
config.addDefault("ignores-path", Ignores.defaultPath.apply(plugin));
config.addDefault("debug", false);
config.addDefault("bStats", true);
config.options().copyDefaults(true);
plugin.saveConfig();


allowMultiTargetRequest = config.getBoolean("allow-multi-target-request");

if (config.getInt("request-timeout-seconds") < 10) {
Expand Down Expand Up @@ -80,7 +82,9 @@ public static synchronized void load(Plugin plugin) {

includeLeashedInterdimensional = config.getBoolean("include-leashed-interdimensional");

//noinspection DataFlowIssue
teleportMountedEntities = config.getBoolean("teleport-mounted-entities");

// noinspection DataFlowIssue
if (config.getString("ignores-path") == null || config.getString("ignores-path").isBlank()) {
config.set("ignores-path", Ignores.defaultPath.apply(plugin));
plugin.saveConfig();
Expand All @@ -90,7 +94,7 @@ public static synchronized void load(Plugin plugin) {
config.set("ignores-path", Ignores.defaultPath.apply(plugin));
plugin.saveConfig();
}
//noinspection DataFlowIssue
// noinspection DataFlowIssue
ignoresPath = Path.of(config.getString("ignores-path"));

debug = config.getBoolean("debug");
Expand Down Expand Up @@ -148,6 +152,11 @@ public static boolean includeLeashedInterdimensional() {
return includeLeashedInterdimensional;
}

public static boolean teleportMountedEntities() {
assertInitialized();
return teleportMountedEntities;
}

public static Path ignoresPath() {
assertInitialized();
return ignoresPath;
Expand Down
Loading