Merge branch 'development' into dependabot/maven/development/com.sk89q.worldguard-worldguard-bukkit-7.0.8

Remove UUID from vanished list on removal (#298 )
Co-authored-by: Ryan <Wild1145@users.noreply.github.com> Co-authored-by: Paldiu <pawereus@gmail.com>
2025-07-01 04:26:42 +00:00 · 2023-07-05 16:13:17 +01:00 · 2023-07-05 16:10:07 +01:00 · 2023-07-04 18:51:11 -05:00 · 2023-07-04 18:49:01 -05:00 · 2023-07-01 22:28:55 +00:00
4 changed files with 7 additions and 8 deletions
--- a/pom.xml
+++ b/pom.xml
@ -128,8 +128,8 @@

        <dependency>
            <groupId>me.totalfreedom.scissors</groupId>
-            <artifactId>scissors-api</artifactId>
-            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <artifactId>Scissors-API</artifactId>
+            <version>1.19.4-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>

@ -150,7 +150,7 @@
        <dependency>
            <groupId>com.sk89q.worldedit</groupId>
            <artifactId>worldedit-bukkit</artifactId>
-            <version>7.2.12</version>
+            <version>7.2.15</version>
            <scope>provided</scope>
        </dependency>

@ -171,7 +171,7 @@
        <dependency>
            <groupId>com.sk89q.worldguard</groupId>
            <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.7</version>
+            <version>7.0.8</version>
            <scope>provided</scope>
        </dependency>

--- a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java
@ -156,7 +156,7 @@ public class Admin
                }

                // Ensure admins don't have admin functionality when removed (FS-222)
-                AdminList.vanished.remove(getName());
+                AdminList.vanished.remove(getUuid());

                if (plugin.esb != null)
                {
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
@ -4,8 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-/* TODO This will have to be changed from com.github.atlasmediagroup.scissors to me.totalfreedom.scissors when we migrate to 1.19 */
-import com.github.atlasmediagroup.scissors.event.block.MasterBlockFireEvent;
+import me.totalfreedom.scissors.event.block.MasterBlockFireEvent;
 import io.papermc.paper.event.player.PlayerSignCommandPreprocessEvent;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@ -13,7 +13,7 @@ softdepend:
  - JDA
  - Votifier
 authors: [Madgeek1450, Prozza]
-api-version: "1.17"
+api-version: "1.19"
 libraries:
  - org.apache.commons:commons-lang3:3.12.0
  - commons-io:commons-io:2.11.0
Author	SHA1	Message	Date
allinkdev	47d429a8f9	Merge branch 'development' into dependabot/maven/development/com.sk89q.worldguard-worldguard-bukkit-7.0.8	2023-07-05 16:13:17 +01:00
allinkdev	7faf719555	Remove UUID from vanished list on removal (#298 ) Co-authored-by: Ryan <Wild1145@users.noreply.github.com> Co-authored-by: Paldiu <pawereus@gmail.com>	2023-07-05 16:10:07 +01:00
Paldiu	519e54d0ab	Merge branch 'development' into dependabot/maven/development/com.sk89q.worldguard-worldguard-bukkit-7.0.8	2023-07-04 18:51:11 -05:00
Paldiu	3bcf0f5082	Merge pull request #325 from AtlasMediaGroup/dependabot/maven/development/com.sk89q.worldedit-worldedit-bukkit-7.2.15 Bump worldedit-bukkit from 7.2.12 to 7.2.15	2023-07-04 18:49:01 -05:00
dependabot[bot]	40d22fa2e3	Bump worldedit-bukkit from 7.2.12 to 7.2.15 Bumps worldedit-bukkit from 7.2.12 to 7.2.15. --- updated-dependencies: - dependency-name: com.sk89q.worldedit:worldedit-bukkit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-01 22:28:55 +00:00
Video	41923b29d7	Merge pull request #301 from AtlasMediaGroup/ver/1.19.3 Update to 1.19.4	2023-07-01 16:28:08 -06:00
allinkdev	16c00e3ed6	Update Scissors API artifact version to 1.19.4	2023-06-11 21:27:27 +01:00
dependabot[bot]	6f22d07179	Bump worldguard-bukkit from 7.0.7 to 7.0.8 Bumps worldguard-bukkit from 7.0.7 to 7.0.8. --- updated-dependencies: - dependency-name: com.sk89q.worldguard:worldguard-bukkit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-29 02:01:41 +00:00
Ryan	79e7f6904b	Merge branch 'development' into ver/1.19.3	2023-04-02 10:21:14 +01:00
Allink	520bd97176	Merge branch 'development' into ver/1.19.3	2023-03-04 05:14:30 +00:00
Allink	654f5900ba	Update to 1.19.3	2023-02-20 17:44:57 +00:00