Last-minute fixes before release

Spazzinq · Aug 1, 2019 · 18fc1b1 · 18fc1b1
1 parent 468581c
commit 18fc1b1
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 39 deletions.
diff --git a/API/pom.xml b/API/pom.xml
@@ -64,6 +64,32 @@
             <artifactId>spigot-api</artifactId>
             <version>1.14.3-SNAPSHOT</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-lang</artifactId>
+                    <groupId>commons-lang</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>json-simple</artifactId>
+                    <groupId>com.googlecode.json-simple</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>gson</artifactId>
+                    <groupId>com.google.code.gson</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>ebean</artifactId>
+                    <groupId>org.avaje</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>snakeyaml</artifactId>
+                    <groupId>org.yaml</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>bungeecord-chat</artifactId>
+                    <groupId>net.md-5</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/FlightControl/pom.xml b/FlightControl/pom.xml
@@ -119,12 +119,6 @@
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>org.bstats</groupId>
-            <artifactId>bstats-bukkit</artifactId>
-            <version>1.5</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
@@ -149,11 +143,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.8</version>
-        </dependency>
         <dependency>
             <groupId>net.ess3</groupId>
             <artifactId>EssentialsX</artifactId>
@@ -397,5 +386,16 @@
             <version>SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>1.5</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/FlightControl/src/main/java/org/spazzinq/flightcontrol/commands/TempFlyCommand.java b/FlightControl/src/main/java/org/spazzinq/flightcontrol/commands/TempFlyCommand.java
@@ -41,34 +41,32 @@ public final class TempFlyCommand implements CommandExecutor {
             if (args.length >= 1) {
                 Player p = Bukkit.getPlayer(args[0]);
                 if (p != null) {
-                    if (!s.equals(p)) {
-                        if (pl.getFlightManager().getTempBypassList().contains(p)) {
-                            pl.getFlightManager().getTempBypassList().remove(p);
-                            FlightControl.msg(s, "&e&lFlightControl &7» &eYou disabled " + p.getName() + "'s temporary bypass flight!");
-                        } else {
-                            // TODO timed temp-fly
-//                            if (args.length == 2) {
-//                                args[1] = args[1].toLowerCase();
-//                                if (args[1].matches("\\d+[smhd]")) {
-//                                    char unit = args[1].charAt(args[1].length() - 1);
-//                                    // Just in case it's a really
-//                                    long time = Long.parseLong(args[1].substring(0, args[1].length() - 1)) * 1000;
-//
-//                                    switch (unit) {
-//                                        case 'm': time *= 60; break;
-//                                        case 'h': time *= 3600; break;
-//                                        case 'd': time *= 86400; break;
-//                                        default: break;
-//                                    }
-//
-//                                    System.currentTimeMillis() + time
-//                                }
-//                            }
-                            pl.getFlightManager().getTempBypassList().add(p);
-                            FlightControl.msg(s, "&e&lFlightControl &7» &e" + p.getName() + " now has temporary bypass flight until the next server restart!");
-                        }
-                    } else FlightControl.msg(s, "&e&lFlightControl &7» &eControlling yourself is redundant... why don't you " +
-                            (pl.getConfigManager().isAutoUpdate() ? "let your flight automatically enable?" : "just do /fly?"));
+                    // TODO Messages for self-tempfly (enabling it on yourself)
+                    if (pl.getFlightManager().getTempBypassList().contains(p)) {
+                        pl.getFlightManager().getTempBypassList().remove(p);
+                        FlightControl.msg(s, "&e&lFlightControl &7» &eYou disabled " + p.getName() + "'s temporary bypass flight!");
+                    } else {
+                        // TODO timed temp-fly
+                        //                            if (args.length == 2) {
+                        //                                args[1] = args[1].toLowerCase();
+                        //                                if (args[1].matches("\\d+[smhd]")) {
+                        //                                    char unit = args[1].charAt(args[1].length() - 1);
+                        //                                    // Just in case it's a really
+                        //                                    long time = Long.parseLong(args[1].substring(0, args[1].length() - 1)) * 1000;
+                        //
+                        //                                    switch (unit) {
+                        //                                        case 'm': time *= 60; break;
+                        //                                        case 'h': time *= 3600; break;
+                        //                                        case 'd': time *= 86400; break;
+                        //                                        default: break;
+                        //                                    }
+                        //
+                        //                                    System.currentTimeMillis() + time
+                        //                                }
+                        //                            }
+                        pl.getFlightManager().getTempBypassList().add(p);
+                        FlightControl.msg(s, "&e&lFlightControl &7» &e" + p.getName() + " now has temporary bypass flight until the next server restart!");
+                    }
                 } else FlightControl.msg(s, "&e&lFlightControl &7» &eInvalid player! Please provide a valid player to give temporary bypass flight!");
             } else FlightControl.msg(s, "&c&lFlightControl &7» &cPlease provide a player to give temporary bypass flight!");
         } else FlightControl.msg(s, pl.getConfigManager().getNoPermission());