Merge pull request #11 from v0ee/tpc-and-entities2

Tpc and teleporting with entities being ridden

Author: bierdosenhalter

.gitignore

@@ -2,3 +2,4 @@
 /build/
 /run/
 /.idea/
+/bin/

README.md

@@ -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
 

src/main/java/lol/hub/hubtp/Config.java

@@ -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) {
@@ -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) {
@@ -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();
@@ -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");
@@ -148,6 +152,11 @@ public static boolean includeLeashedInterdimensional() {
         return includeLeashedInterdimensional;
     }
 
+    public static boolean teleportMountedEntities() {
+        assertInitialized();
+        return teleportMountedEntities;
+    }
+
     public static Path ignoresPath() {
         assertInitialized();
         return ignoresPath;