fix worldguard hook errors

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.youhavetrouble</groupId>
     <artifactId>PreventStabby</artifactId>
-    <version>1.3-pre1</version>
+    <version>1.3-pre5</version>
     <packaging>jar</packaging>
 
     <name>PreventStabby</name>
@@ -47,7 +47,6 @@
                                 </relocation>
                                 <relocation>
                                     <pattern>org.bstats</pattern>
-                                    <!-- Replace this with your package! -->
                                     <shadedPattern>bstats</shadedPattern>
                                 </relocation>
                             </relocations>
@@ -74,8 +73,12 @@
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </repository>
         <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
+            <id>bs-repo</id>
+            <url>https://ci.pluginwiki.us/plugin/repository/everything/</url>
+        </repository>
+        <repository>
+            <id>sk89q-repo</id>
+            <url>https://maven.enginehub.org/repo/</url>
         </repository>
     </repositories>
 
@@ -98,10 +101,9 @@
             <version>0.9.12</version>
         </dependency>
         <dependency>
-            <groupId>com.github.Thatsmusic99</groupId>
+            <groupId>com.github.thatsmusic99</groupId>
             <artifactId>ConfigurationMaster</artifactId>
-            <version>v1.0-RC-2</version>
-            <scope>compile</scope>
+            <version>v1.0.3</version>
         </dependency>
         <dependency>
             <groupId>org.bstats</groupId>
@@ -109,5 +111,11 @@
             <version>2.2.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.sk89q.worldguard</groupId>
+            <artifactId>worldguard-bukkit</artifactId>
+            <version>7.0.4-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

src/main/java/me/youhavetrouble/preventstabby/PreventStabby.java

@@ -2,6 +2,7 @@ package me.youhavetrouble.preventstabby;
 
 import me.youhavetrouble.preventstabby.commands.MainCommand;
 import me.youhavetrouble.preventstabby.config.ConfigCache;
+import me.youhavetrouble.preventstabby.hooks.WorldGuardHook;
 import me.youhavetrouble.preventstabby.players.PlayerManager;
 import me.youhavetrouble.preventstabby.players.SmartCache;
 import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
@@ -21,9 +22,10 @@ public final class PreventStabby extends JavaPlugin {
 
     @Getter private static PreventStabby plugin;
     private ConfigCache configCache;
-    protected PlayerManager playerManager;
-    protected DatabaseSQLite sqLite;
-    protected SmartCache smartCache;
+    private PlayerManager playerManager;
+    private DatabaseSQLite sqLite;
+    private SmartCache smartCache;
+    private static boolean worldGuardHook;
 
     @Override
     public void onEnable() {
@@ -31,7 +33,7 @@ public final class PreventStabby extends JavaPlugin {
         Util.initData();
         reloadPluginConfig();
         File dbFile = new File("plugins/PreventStabby");
-        sqLite = new DatabaseSQLite("jdbc:sqlite:plugins/PreventStabby/TogglePvP.db", dbFile);
+        sqLite = new DatabaseSQLite("jdbc:sqlite:plugins/PreventStabby/database.db", dbFile);
         sqLite.createDatabaseFile();
         if (!sqLite.testConnection()) {
             getLogger().severe("Error with accessing database. Check if server has write rights.");
@@ -44,7 +46,7 @@ public final class PreventStabby extends JavaPlugin {
         smartCache.runSmartCache();
 
         // Register listeners
-        Reflections reflections = new Reflections(new String[]{"eu.endermite.preventstabby"});
+        Reflections reflections = new Reflections((Object[]) new String[]{"me.youhavetrouble.preventstabby"});
         Set<Class<?>> listenerClasses = reflections.getTypesAnnotatedWith(PreventStabbyListener.class);
         listenerClasses.forEach((listener)-> {
             try {
@@ -68,9 +70,20 @@ public final class PreventStabby extends JavaPlugin {
         pvpCommand.setExecutor(mainCommand);
         pvpCommand.setTabCompleter(mainCommand);
 
+        try {
+            WorldGuardHook.init();
+            worldGuardHook = true;
+        } catch (NoClassDefFoundError e) {
+            worldGuardHook = false;
+        }
+
         Metrics metrics = new Metrics(this, 10597);
     }
 
+    public static boolean worldGuardHookEnabled() {
+        return worldGuardHook;
+    }
+
     public void reloadPluginConfig() {
         configCache = new ConfigCache();
     }
@@ -78,7 +91,7 @@ public final class PreventStabby extends JavaPlugin {
     public void reloadPluginConfig(CommandSender commandSender) {
         getServer().getScheduler().runTaskAsynchronously(this, () -> {
             reloadPluginConfig();
-            commandSender.sendMessage("TogglePvP configuration reloaded.");
+            commandSender.sendMessage("PreventStabby configuration reloaded.");
         });
     }
 

src/main/java/me/youhavetrouble/preventstabby/commands/HelpCommand.java

@@ -14,7 +14,7 @@ public class HelpCommand {
 
             List<String> helpPage = new ArrayList<>();
 
-            helpPage.add(PluginMessages.parseMessage("&b&m             &bTogglePvP Help&b&m             "));
+            helpPage.add(PluginMessages.parseMessage("&b&m             &bPreventStabby Help&b&m             "));
             helpPage.add(PluginMessages.parseMessage("&9/pvp &b&lhelp &f- shows this message"));
             if (sender.hasPermission("preventstabby.command.toggle")) {
                 helpPage.add(PluginMessages.parseMessage("&9/pvp &b&l[on/off] &f- enables or disables PvP"));

src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java

@@ -0,0 +1,63 @@
+package me.youhavetrouble.preventstabby.hooks;
+
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.flags.registry.FlagConflictException;
+import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
+import com.sk89q.worldguard.protection.regions.RegionContainer;
+import com.sk89q.worldguard.protection.regions.RegionQuery;
+import me.youhavetrouble.preventstabby.PreventStabby;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+public class WorldGuardHook {
+
+    private static FlagRegistry flagRegistry;
+    public static StateFlag FORCE_PVP_FLAG;
+
+    public static void init() {
+        PreventStabby plugin = PreventStabby.getPlugin();
+        try {
+            Class.forName("com.sk89q.worldguard.protection.flags.registry.FlagConflictException");
+            WorldGuardPlugin worldGuardPlugin = WorldGuardPlugin.inst();
+            if (WorldGuard.getInstance() == null || worldGuardPlugin == null) return;
+            plugin.getLogger().info("Hooking into WorldGuard");
+            flagRegistry = WorldGuard.getInstance().getFlagRegistry();
+            createForcePvpFlag(plugin);
+        } catch (NoClassDefFoundError | ClassNotFoundException ignored) {
+        }
+    }
+
+    private static void createForcePvpFlag(Plugin plugin) {
+        if (flagRegistry == null) return;
+        String flagName = "preventstabby-force-pvp";
+        try {
+            StateFlag flag = new StateFlag(flagName, false);
+            flagRegistry.register(flag);
+            FORCE_PVP_FLAG = flag;
+        } catch (FlagConflictException e) {
+            Flag<?> existing = flagRegistry.get(flagName);
+            if (existing instanceof StateFlag) {
+                FORCE_PVP_FLAG = (StateFlag) existing;
+            } else {
+                plugin.getLogger().severe("There is a conflict between flag names!");
+            }
+        }
+    }
+
+    public static boolean isPlayerForcedToPvp(Player player) {
+        RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
+        RegionQuery query = container.createQuery();
+        org.bukkit.Location loc = player.getLocation();
+        LocalPlayer localPlayer = WorldGuardPlugin.inst().wrapPlayer(player);
+        ApplicableRegionSet set = query.getApplicableRegions(new Location(BukkitAdapter.adapt(loc.getWorld()), loc.getX(), loc.getY(), loc.getZ()));
+        return set.testState(localPlayer, FORCE_PVP_FLAG);
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/player/PlayerJoinAndLeaveListener.java

@@ -26,7 +26,7 @@ public class PlayerJoinAndLeaveListener implements Listener {
         PlayerData playerData = PreventStabby.getPlugin().getPlayerManager().getPlayer(player.getUniqueId());
         long time = Instant.now().getEpochSecond();
         if (playerData == null) {
-            PreventStabby.getPlugin().getPlayerManager().addPlayer(uuid, new PlayerData(false));
+            PreventStabby.getPlugin().getPlayerManager().addPlayer(uuid, new PlayerData(uuid,false));
             Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> {
                 PlayerData data = PreventStabby.getPlugin().getSqLite().getPlayerInfo(uuid);
                 PreventStabby.getPlugin().getPlayerManager().addPlayer(uuid, data);

src/main/java/me/youhavetrouble/preventstabby/players/PlayerData.java

@@ -7,11 +7,12 @@ import java.util.UUID;
 
 public class PlayerData {
 
-    private UUID playerUuid;
+    private final UUID playerUuid;
     private long cachetime, combattime, loginTimestamp, teleportTimestamp;
     private boolean pvpEnabled, lastCombatCheck, inCombat;
 
-    public PlayerData(boolean pvpEnabled) {
+    public PlayerData(UUID playerUuid, boolean pvpEnabled) {
+        this.playerUuid = playerUuid;
         this.pvpEnabled = pvpEnabled;
         this.combattime = Instant.now().getEpochSecond()-1;
         this.loginTimestamp = Instant.now().getEpochSecond()-1;

src/main/java/me/youhavetrouble/preventstabby/players/PlayerManager.java

@@ -3,6 +3,7 @@ package me.youhavetrouble.preventstabby.players;
 import me.youhavetrouble.preventstabby.PreventStabby;
 import me.youhavetrouble.preventstabby.api.event.PlayerLeaveCombatEvent;
 import me.youhavetrouble.preventstabby.config.ConfigCache;
+import me.youhavetrouble.preventstabby.hooks.WorldGuardHook;
 import me.youhavetrouble.preventstabby.util.CombatTimer;
 import me.youhavetrouble.preventstabby.util.PluginMessages;
 import lombok.Getter;
@@ -36,8 +37,7 @@ public class PlayerManager {
                 if (!CombatTimer.isInCombat(uuid)) {
                     if (playerData.getLastCombatCheck()) {
                         Player player = Bukkit.getPlayer(uuid);
-                        if (player == null)
-                            return;
+                        if (player == null) continue;
                         PlayerLeaveCombatEvent playerLeaveCombatEvent = new PlayerLeaveCombatEvent(player);
                         Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> {
                             Bukkit.getPluginManager().callEvent(playerLeaveCombatEvent);
@@ -111,18 +111,16 @@ public class PlayerManager {
 
     public boolean canDamage(UUID attacker, UUID victim, boolean sendDenyMessage, boolean checkVictimSpawnProtection) {
 
-        if (hasLoginProtection(attacker) || hasTeleportProtection(attacker))
-            return false;
-
-        if (checkVictimSpawnProtection && hasLoginProtection(victim))
-            return false;
-
-        if (checkVictimSpawnProtection && hasTeleportProtection(victim))
-            return false;
+        if (hasLoginProtection(attacker) || hasTeleportProtection(attacker)) return false;
+        if (checkVictimSpawnProtection && hasLoginProtection(victim)) return false;
+        if (checkVictimSpawnProtection && hasTeleportProtection(victim)) return false;
 
         SmartCache smartCache = PreventStabby.getPlugin().getSmartCache();
 
         if (!smartCache.getPlayerData(attacker).isPvpEnabled()) {
+            Player attackerPlayer = Bukkit.getPlayer(attacker);
+            if (PreventStabby.worldGuardHookEnabled() && WorldGuardHook.isPlayerForcedToPvp(attackerPlayer)) return true;
+
             if (sendDenyMessage) {
                 ConfigCache config = PreventStabby.getPlugin().getConfigCache();
                 PluginMessages.sendActionBar(attacker, config.getCannot_attack_attacker());
@@ -130,6 +128,9 @@ public class PlayerManager {
             return false;
         }
         if (!smartCache.getPlayerData(victim).isPvpEnabled()) {
+            Player victimPlayer = Bukkit.getPlayer(victim);
+            if (PreventStabby.worldGuardHookEnabled() && WorldGuardHook.isPlayerForcedToPvp(victimPlayer)) return true;
+
             if (sendDenyMessage) {
                 ConfigCache config = PreventStabby.getPlugin().getConfigCache();
                 PluginMessages.sendActionBar(attacker, config.getCannot_attack_victim());

src/main/java/me/youhavetrouble/preventstabby/players/SmartCache.java

@@ -42,7 +42,7 @@ public class SmartCache {
                 return playerData;
             } catch (NullPointerException ex) {
                 // Return false if database call fails
-                return new PlayerData(false);
+                return new PlayerData(uuid,false);
             }
         }
     }
@@ -53,7 +53,7 @@ public class SmartCache {
             PreventStabby.getPlugin().getPlayerManager().getPlayer(uuid).setPvpEnabled(state);
         }
         // Update the database aswell
-        PreventStabby.getPlugin().getSqLite().updatePlayerInfo(uuid, new PlayerData(state));
+        PreventStabby.getPlugin().getSqLite().updatePlayerInfo(uuid, new PlayerData(uuid, state));
     }
 
 

src/main/java/me/youhavetrouble/preventstabby/util/DatabaseSQLite.java

@@ -64,12 +64,12 @@ public class DatabaseSQLite {
                 }
             }
             Statement statement = conn.createStatement();
-            String sql = "SELECT * FROM `players` WHERE `player_uuid` = '" + uuid.toString() + "';";
+            String sql = "SELECT * FROM `players` WHERE `player_uuid` = '" + uuid + "';";
             statement.execute(sql);
             ResultSet result = statement.getResultSet();
             boolean state = result.getBoolean("pvpenabled");
             conn.close();
-            return new PlayerData(state);
+            return new PlayerData(uuid, state);
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }

src/main/java/me/youhavetrouble/preventstabby/util/Util.java

@@ -45,14 +45,16 @@ public class Util {
 
         Set<UUID> playerPassengersWithPvpEnabled = new HashSet<>();
 
+        boolean hasPlayerPassengers = false;
         for (Entity passenger : mount.getPassengers()) {
             if (!(passenger instanceof Player)) continue;
             Player player = (Player) passenger;
+            hasPlayerPassengers = true;
             if (PreventStabby.getPlugin().getPlayerManager().getPlayerPvPState(player.getUniqueId()))
                 playerPassengersWithPvpEnabled.add(player.getUniqueId());
         }
 
-        if (playerPassengersWithPvpEnabled.isEmpty()) {
+        if (hasPlayerPassengers && playerPassengersWithPvpEnabled.isEmpty()) {
             PluginMessages.sendActionBar(attacker, config.getCannot_attack_mounts_victim());
             return true;
         }

src/main/resources/plugin.yml

@@ -1,11 +1,14 @@
-name: TogglePvP
+name: PreventStabby
 version: ${project.version}
-main: eu.endermite.togglepvp.PreventStabby
+main: me.youhavetrouble.preventstabby.PreventStabby
 authors: [YouHaveTrouble]
 api-version: 1.13
 description: Stop people from getting stabbed!
+soft-depend:
+  - WorldGuard
 commands:
   preventstabby:
+    permission: preventstabby.command
     aliases:
       - pvp
 permissions: