Merge branch 'development' into FS-215

.github/workflows/java17-maven.yml

@@ -1,9 +1,9 @@
-name: Java16-Maven-Build
+name: Java17-Maven-Build
 
 on: [push]
 
 jobs:
-  build-java-16:
+  build-java-17:
 
     runs-on: ubuntu-latest
 
@@ -12,10 +12,10 @@ jobs:
     - uses: actions/checkout@v1
 
     # Java 16 Builds
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2.3.0
       with:
-        java-version: 16
+        java-version: 17
         distribution: 'adopt'
     - name: Build with Maven
       run: mvn -B package --file pom.xml

SECURITY.md

@@ -11,20 +11,23 @@ These versions are currently actively supported by our team, and you should expe
 
 | Version             | Supported          | Support End:                   |
 | ------------------- | ------------------ | ------------------------------ |
-| 2021.05             | :white_check_mark: | No Earlier than August 2021    |
+| 2021.09             | :white_check_mark: | No Earlier than December 2021    |
 
 ### Legacy Supported
 These versions are no longer under active development, however we will look to release critical secuirty patches where appropriate. 
 
 | Version             | Supported          | Support End: |
 | ------------------- | ------------------ | ------------ |
-| 2021.04             | :white_check_mark: | July 2021    |
+| 2021.06             | :white_check_mark: | October 2021 |
+
 
 ### No Longer Supported
 These versions are no longer supported at all. It is strongly advised to update if you are running any of these versions. 
 
 | Version             | Supported          | Support Ended:      |
 | ------------------- | ------------------ | ------------------- |
+| 2021.05             | :white_check_mark: | September 2021      |
+| 2021.04             | :white_check_mark: | July 2021           |
 | 2021.02             | :x:                | 6 June 2021         |
 | 2020.11             | :x:                | 3 May 2021          |
 | 6.0.x (Pre-Release) | :x:                | December 2020       |

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.06</version>
+    <version>2021.09</version>
     <packaging>jar</packaging>
 
     <properties>

src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java

@@ -276,18 +276,14 @@ public class CoreProtectBridge extends FreedomService
         Block block = event.getClickedBlock();
         final CoreProtectAPI coreProtect = getCoreProtectAPI();
 
+        // TODO: Rewrite this
         if (data.hasInspection())
         {
-            if (event.getAction() == Action.LEFT_CLICK_BLOCK)
-            {
-                if (block != null)
-                {
-                    event.setCancelled(true);
-                    List<String[]> lookup = coreProtect.blockLookup(block, -1);
-
             int cooldownTime = 3;
 
-                    if (cooldown.containsKey(player.getName()))
+            // Cooldown check
+            if ((event.getAction() == Action.LEFT_CLICK_BLOCK || event.getAction() == Action.RIGHT_CLICK_BLOCK)
+                    && cooldown.containsKey(player.getName()))
             {
                 long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
                 if (secondsLeft > 0L)
@@ -298,6 +294,14 @@ public class CoreProtectBridge extends FreedomService
                 }
             }
 
+            // Actual lookup time
+            if (event.getAction() == Action.LEFT_CLICK_BLOCK)
+            {
+                if (block != null)
+                {
+                    event.setCancelled(true);
+                    List<String[]> lookup = coreProtect.blockLookup(block, -1);
+
                     if (!plugin.al.isAdmin(player))
                     {
                         cooldown.put(player.getName(), System.currentTimeMillis());
@@ -363,8 +367,6 @@ public class CoreProtectBridge extends FreedomService
             else if (event.getAction() == Action.RIGHT_CLICK_BLOCK)
             {
                 if (block != null)
-                {
-                    if (data.hasInspection())
                 {
                     BlockState blockState = block.getRelative(event.getBlockFace()).getState();
                     Block placedBlock = blockState.getBlock();
@@ -376,19 +378,6 @@ public class CoreProtectBridge extends FreedomService
                         lookup = coreProtect.blockLookup(block, -1);
                     }
 
-                        int cooldownTime = 3;
-
-                        if (cooldown.containsKey(player.getName()))
-                        {
-                            long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
-                            if (secondsLeft > 0L)
-                            {
-                                event.setCancelled(true);
-                                player.sendMessage(ChatColor.RED + String.valueOf(secondsLeft) + " seconds left before next query.");
-                                return;
-                            }
-                        }
-
                     if (!plugin.al.isAdmin(player))
                     {
                         cooldown.put(player.getName(), System.currentTimeMillis());
@@ -454,4 +443,3 @@ public class CoreProtectBridge extends FreedomService
         }
     }
 }
-}