Cancel directors if not able to build (#17)

* Cancel directors if not able to build * Update build.gradle.kts * Register event
APDevTeam · Jul 27, 2024 · 4f873a4 · 4f873a4
1 parent d765dd8
commit 4f873a4
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,8 +20,8 @@ dependencies {
     api("org.jetbrains:annotations-java5:24.1.0")
     compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT")
     compileOnly("net.countercraft:movecraft:+")
-    compileOnly("net.countercraft.movecraft.combat:movecraft-combat:+")
-    compileOnly("net.countercraft.movecraft.repair:movecraft-repair:1.0.0_beta-4_gradle-2")
+    compileOnly("net.countercraft.movecraft.combat:movecraft-combat:2.0.0_beta-5_dev-1")
+    compileOnly("net.countercraft.movecraft.repair:movecraft-repair:+")
     api("com.sk89q.worldedit:worldedit-core:7.2.9")
     api("com.sk89q.worldguard:worldguard-bukkit:7.0.7")
 }

diff --git a/src/main/java/net/countercraft/movecraft/worldguard/MovecraftWorldGuard.java b/src/main/java/net/countercraft/movecraft/worldguard/MovecraftWorldGuard.java
@@ -67,6 +67,7 @@ public void onEnable() {
         }
 
         getServer().getPluginManager().registerEvents(new CraftDetectListener(), this);
+        getServer().getPluginManager().registerEvents(new CraftDirectListener(), this);
         getServer().getPluginManager().registerEvents(new CraftRotateListener(), this);
         getServer().getPluginManager().registerEvents(new CraftSinkListener(), this);
         getServer().getPluginManager().registerEvents(new CraftTranslateListener(), this);

diff --git a/src/main/java/net/countercraft/movecraft/worldguard/listener/CraftDirectListener.java b/src/main/java/net/countercraft/movecraft/worldguard/listener/CraftDirectListener.java
@@ -0,0 +1,39 @@
+package net.countercraft.movecraft.worldguard.listener;
+
+import com.sk89q.worldguard.protection.flags.Flags;
+import net.countercraft.movecraft.combat.features.directors.Directors;
+import net.countercraft.movecraft.combat.features.directors.events.CraftDirectEvent;
+import net.countercraft.movecraft.exception.EmptyHitBoxException;
+import net.countercraft.movecraft.worldguard.MovecraftWorldGuard;
+import net.countercraft.movecraft.worldguard.localisation.I18nSupport;
+import net.countercraft.movecraft.worldguard.utils.WorldGuardUtils;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.jetbrains.annotations.NotNull;
+
+public class CraftDirectListener implements Listener {
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
+    public void onCraftDirect(@NotNull CraftDirectEvent e) {
+        Player p = e.getPlayer();
+        WorldGuardUtils wgUtils = MovecraftWorldGuard.getInstance().getWGUtils();
+        try {
+            // Check build flag
+            switch (wgUtils.getState(p, p.getLocation(), Flags.BUILD)) {
+                case ALLOW:
+                    break; // Player is allowed to build
+                case NONE:
+                case DENY:
+                    // Player is not allowed to build
+                    e.setCancelled(true);
+                    Directors.clearDirector(p);
+                    p.sendMessage(I18nSupport.getInternationalisedString("Directing - WorldGuard - Not Permitted To Build"));
+                    return;
+                default:
+                    break;
+            }
+        } catch (EmptyHitBoxException ignored) {
+        }
+    }
+}
diff --git a/src/main/resources/localisation/movecraftworldguardlang_en.properties b/src/main/resources/localisation/movecraftworldguardlang_en.properties
@@ -1,4 +1,5 @@
 Detection\ -\ WorldGuard\ -\ Not\ Permitted\ To\ Build=Detection Failed - Player is not permitted to build in this WorldGuard region
+Directing\ -\ WorldGuard\ -\ Not\ Permitted\ To\ Build=Directing Failed - Player is not permitted to build in this WorldGuard region
 Rotation\ -\ WorldGuard\ -\ Not\ Permitted\ To\ Build=Rotation Failed - Player is not permitted to build in this WorldGuard region
 Repair\ -\ WorldGuard\ -\ Not\ Permitted\ To\ Build=Repair Failed - Player is not permitted to build in this WorldGuard region
 Player\ -\ Craft\ should\ sink\ but\ PVP\ is\ not\ allowed\ in\ this\ WorldGuard\ region=Craft should sink but PVP is not allowed in this WorldGuard region