Merge pull request #145 from AtlasMediaGroup/RELEASE-2021.09

Release 2021.09
Official Release
2025-07-01 04:26:42 +00:00 · 2021-11-22 18:43:06 +00:00 · 2021-11-22 12:29:54 -06:00 · 2021-11-13 02:58:36 -07:00 · 2021-11-13 02:48:51 -07:00 · 2021-11-13 02:35:30 -07:00
3 changed files with 78 additions and 90 deletions
--- a/.github/workflows/java17-maven.yml
+++ b/.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
--- a/pom.xml
+++ b/pom.xml
@ -5,7 +5,7 @@

    <groupId>me.totalfreedom</groupId>
    <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.09-RC01</version>
+    <version>2021.09</version>
    <packaging>jar</packaging>

    <properties>
@ -429,8 +429,8 @@
                                    <include>org.reflections:reflections</include>
                                    <include>org.javassist:javassist</include>
                                    <include>io.papermc:paperlib</include>
-                                    <include>com.github.speedxx:Mojangson</include>
                                    <include>org.bstats:bstats-bukkit</include>
+                                    <include>org.bstats:bstats-base</include>
                                    <include>org.jetbrains:annotations</include>
                                </includes>
                            </artifactSet>
--- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java
+++ b/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
        }
    }
 }
-}
Author	SHA1	Message	Date
Ryan	6453e4efca	Merge pull request #145 from AtlasMediaGroup/RELEASE-2021.09 Release 2021.09	2021-11-22 18:43:06 +00:00
Paldiu	9155ac90b5	Official Release	2021-11-22 12:29:54 -06:00
Video	1e1367d08f	Bump to RC03	2021-11-13 02:58:36 -07:00
Video	3f690e2ca1	Merge pull request #167 from AtlasMediaGroup/whoops Fixes an oopsie I made whilst sleep deprived	2021-11-13 02:48:51 -07:00
Video	abfa3b977c	Whoops This commit fixes 2 things: 1. A redundant check that was completely unnecessary 2. A loophole in my original bugfix commit I didn't initially discover until afterwards which enables players to do the same thing except with right clicking instead The block inspector should be completely rewritten in the future, but for now it works.	2021-11-13 02:35:30 -07:00
Paldiu	a728ec24d4	Merge pull request #156 from AtlasMediaGroup/critical-inspect-bugfix Critical Bugfix	2021-10-04 17:59:10 -05:00
Video	74a71b1843	Important bugfix It appears someone had an extremely big brain moment.	2021-10-04 16:02:39 -06:00
Ryan	4d469cdc0a	Move from Java 16 to Java 17 (#149 ) * Move from Java 16 to Java 17 * Update java17-maven.yml	2021-10-03 15:57:47 +01:00
Ryan Wild	4c287ca9b8	Bump to RC02	2021-10-03 15:50:33 +01:00
Video	912bc1a1e4	Merge pull request #154 from AtlasMediaGroup/development Development	2021-10-03 07:02:37 -06:00
Video	a598c933ec	Merge pull request #151 from AtlasMediaGroup/FS-421 Two fixes (FS-421)	2021-10-03 06:52:45 -06:00
Video	936f0b621e	Stupid simple fix Fixes an oopsie I made and an oopsie someone else made which broke the entire plugin.	2021-10-03 06:45:02 -06:00