make sure mount has player rider before checking for attack cancel

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: YouHaveTrouble
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

pom.xml

@@ -4,14 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>eu.endermite</groupId>
-    <artifactId>TogglePvP</artifactId>
-    <version>1.0</version>
+    <groupId>me.youhavetrouble</groupId>
+    <artifactId>PreventStabby</artifactId>
+    <version>1.3-pre4</version>
     <packaging>jar</packaging>
 
-    <name>TogglePvP</name>
+    <name>PreventStabby</name>
 
-    <description>PvP toggle plugin</description>
+    <description>Stop people from getting stabbed!</description>
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -40,6 +40,17 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <relocations>
+                                <relocation>
+                                    <pattern>io.github.thatsmusic99</pattern>
+                                    <shadedPattern>configurationmaster</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.bstats</pattern>
+                                    <!-- Replace this with your package! -->
+                                    <shadedPattern>bstats</shadedPattern>
+                                </relocation>
+                            </relocations>
                         </configuration>
                     </execution>
                 </executions>
@@ -62,13 +73,21 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </repository>
+        <repository>
+            <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>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.16.2-R0.1-SNAPSHOT</version>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -82,5 +101,22 @@
             <artifactId>reflections</artifactId>
             <version>0.9.12</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.thatsmusic99</groupId>
+            <artifactId>ConfigurationMaster</artifactId>
+            <version>v1.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <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>

readme.md

@@ -1,23 +1,21 @@
-<h2>TogglePvP ⚔</h2>
-
-Plugin is under heavy development and things will change often.
+<h2>PreventStabby ⚔</h2>
 
 Use Issues section to report bugs or submit suggestions.
 
 <h3>Commands</h3>
-Permission: <code>togglepvp.command</code> (given by default) :
+Permission: <code>preventstabby.command</code> (given by default to everyone) :
 <ul>
 <li>/pvp help- displays help message</li>
 </ul>
 
-Permission: <code>togglepvp.command.toggle</code> (given by default) :
+Permission: <code>preventstabby.command.toggle</code> (given by default to everyone) :
 <ul>
 <li>/pvp toggle - toggles PvP</li>
 <li>/pvp on - enables PvP (aliases: enable)</li>
 <li>/pvp off - disables PvP (aliases: disable)</li>
 </ul>
 
-Permission: <code>togglepvp.command.toggle.others</code> (given by default) :
+Permission: <code>preventstabby.command.toggle.others</code> (given by default to ops) :
 <ul>
 <li>/pvp toggle [player] - toggles other player's PvP</li>
 <li>/pvp on [player] - enables other player's PvP (aliases: enable)</li>
@@ -37,11 +35,9 @@ There is also a feature that disallows pouring lava or using
 flint and steel nearby players with disabled pvp. You can
 either disable it in config or set its radius.
 
-Tamed wolves will not attack players with pvp off.
+All the protections are extended to tameable entities (pets) that set player's uuid as their owner on tame.
+
+Pets will not attack players with pvp off or if their owner has pvp off.
 
-<h3>TODO</h3>
-<ul>
-<li>combat timer - deny players changing pvp state mid combat</li>
-</ul>
 
 

src/main/java/eu/endermite/togglepvp/TogglePvpAPI.java

@@ -1,27 +0,0 @@
-package eu.endermite.togglepvp;
-
-import eu.endermite.togglepvp.players.SmartCache;
-import java.util.UUID;
-
-public class TogglePvpAPI {
-
-    /**
-     * Sets player PvP state. This will always save to database.
-     * @param uuid uuid of player to set
-     * @param newState State to set
-     */
-    public static void setPvpEnabled(UUID uuid, boolean newState) {
-        SmartCache.setPlayerPvpState(uuid, newState);
-    }
-
-    /**
-     * Gets player's PvP state. If player is not cached this will query the database.
-     * @param uuid uuid of player to get data from.
-     * @return true if enabled, false if disabled
-     */
-    public static boolean getPvpEnabled(UUID uuid) {
-        return SmartCache.getPlayerData(uuid).isPvpEnabled();
-    }
-
-
-}

src/main/java/eu/endermite/togglepvp/commands/MainCommand.java

@@ -1,86 +0,0 @@
-package eu.endermite.togglepvp.commands;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import java.util.ArrayList;
-import java.util.List;
-
-public class MainCommand implements TabExecutor {
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (sender.hasPermission("togglepvp.command")) {
-            if (args.length >= 1) {
-                switch (args[0].toLowerCase()) {
-                    case "help":
-                        HelpCommand.help(sender, args);
-                        break;
-                    case "toggle":
-                        PvpToggleCommand.toggle(sender, args);
-                        break;
-                    case "on":
-                    case "enable":
-                        PvpToggleCommand.enable(sender, args);
-                        break;
-                    case "off":
-                    case "disable":
-                        PvpToggleCommand.disable(sender, args);
-                        break;
-                    case "reload":
-                        ReloadCommand.reload(sender);
-                        break;
-                    default:
-                        sender.sendMessage(PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getNo_such_command()));
-                        break;
-                }
-            } else {
-                HelpCommand.help(sender, args);
-            }
-        } else {
-            sender.sendMessage(PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getNo_permission()));
-        }
-        return true;
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        List<String> commands = new ArrayList<>();
-        String arg1 = args[0].toLowerCase();
-
-        List<String> noPerm = new ArrayList<>();
-        noPerm.add("help");
-
-        List<String> reloadPerm = new ArrayList<>();
-        reloadPerm.add("reload");
-
-        List<String> togglePerm = new ArrayList<>();
-        togglePerm.add("toggle");
-        togglePerm.add("on");
-        togglePerm.add("enable");
-        togglePerm.add("off");
-        togglePerm.add("disable");
-
-        if (args.length == 1) {
-            for (String noPermCmd : noPerm) {
-                if (noPermCmd.startsWith(arg1))
-                    commands.add(noPermCmd);
-            }
-            if (sender.hasPermission("togglepvp.command.toggle")) {
-                for (String togglePermCmd : togglePerm) {
-                    if (togglePermCmd.startsWith(arg1))
-                        commands.add(togglePermCmd);
-                }
-            }
-            if (sender.hasPermission("togglepvp.command.reload")) {
-                for (String reloadPermCmd : reloadPerm) {
-                    if (reloadPermCmd.startsWith(arg1))
-                        commands.add(reloadPermCmd);
-                }
-            }
-        }
-        return commands;
-    }
-}

src/main/java/eu/endermite/togglepvp/commands/PvpToggleCommand.java

@@ -1,191 +0,0 @@
-package eu.endermite.togglepvp.commands;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import net.md_5.bungee.api.ChatMessageType;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.TextComponent;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class PvpToggleCommand {
-
-    public static void toggle(CommandSender sender, String[] args) {
-
-        Bukkit.getScheduler().runTaskAsynchronously(TogglePvp.getPlugin(), () -> {
-
-            if (!sender.hasPermission("togglepvp.command.toggle")) {
-                String message = TogglePvp.getPlugin().getConfigCache().getNo_permission();
-                BaseComponent[] component = TextComponent.fromLegacyText(message);
-                sender.spigot().sendMessage(component);
-                return;
-            }
-
-            if (args.length == 1) {
-                if (sender instanceof Player) {
-                    Player player = (Player) sender;
-
-                    if (CombatTimer.isInCombat(player.getUniqueId())) {
-                        sender.sendMessage(PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getCant_do_that_during_combat()));
-                        return;
-                    }
-
-                    boolean currentState = TogglePvp.getPlugin().getPlayerManager().togglePlayerPvpState(player.getUniqueId());
-
-                    String message = "";
-                    if (currentState) {
-                        message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_enabled());
-                    } else {
-                        message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_disabled());
-                    }
-                    BaseComponent[] component = TextComponent.fromLegacyText(message);
-                    player.spigot().sendMessage(ChatMessageType.CHAT, component);
-                } else {
-                    sender.sendMessage("Try /pvp toggle <player>");
-                }
-            } else if (args.length == 2) {
-                if (!sender.hasPermission("togglepvp.command.toggle.others")) {
-                    String message = TogglePvp.getPlugin().getConfigCache().getNo_permission();
-                    BaseComponent[] component = TextComponent.fromLegacyText(message);
-                    sender.spigot().sendMessage(component);
-                    return;
-                }
-
-                if (sender instanceof Player) {
-                    Player player = (Player) sender;
-                    if (CombatTimer.isInCombat(player.getUniqueId())) {
-                        sender.sendMessage(PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getCant_do_that_during_combat()));
-                        return;
-                    }
-                }
-                try {
-                    Player player = Bukkit.getPlayer(args[1]);
-                    boolean currentState = TogglePvp.getPlugin().getPlayerManager().togglePlayerPvpState(player.getUniqueId());
-                    String message;
-                    if (currentState) {
-                        message = TogglePvp.getPlugin().getConfigCache().getPvp_enabled_other();
-                    } else {
-                        message = TogglePvp.getPlugin().getConfigCache().getPvp_disabled_other();
-                    }
-                    sender.sendMessage(PluginMessages.parsePlayerName(player, message));
-
-                } catch (NullPointerException e) {
-                    sender.sendMessage(PluginMessages.parseMessage("&cPlayer offline."));
-                }
-            } else {
-                if (sender.hasPermission("togglepvp.command.toggle.others")) {
-                    sender.sendMessage("Try /pvp toggle <player>");
-                } else {
-                    sender.sendMessage("Try /pvp toggle");
-                }
-            }
-        });
-    }
-
-    public static void enable(CommandSender sender, String[] args) {
-        if (!sender.hasPermission("togglepvp.command.toggle")) {
-            String message = TogglePvp.getPlugin().getConfigCache().getNo_permission();
-            BaseComponent[] component = TextComponent.fromLegacyText(message);
-            sender.spigot().sendMessage(component);
-            return;
-        }
-        if (args.length == 1) {
-            if (sender instanceof Player) {
-                Player player = (Player) sender;
-                if (CombatTimer.isInCombat(player.getUniqueId())) {
-                    sender.sendMessage(PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getCant_do_that_during_combat()));
-                    return;
-                }
-                TogglePvp.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), true);
-                String message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_enabled());
-                BaseComponent[] component = TextComponent.fromLegacyText(message);
-                player.spigot().sendMessage(ChatMessageType.CHAT, component);
-            } else {
-                sender.sendMessage("Try /pvp enable <player>");
-            }
-        } else if (args.length == 2) {
-            if (!sender.hasPermission("togglepvp.command.toggle.others")) {
-                String message = TogglePvp.getPlugin().getConfigCache().getNo_permission();
-                BaseComponent[] component = TextComponent.fromLegacyText(message);
-                sender.spigot().sendMessage(component);
-                return;
-            }
-            if (sender instanceof Player) {
-                Player player = (Player) sender;
-                if (CombatTimer.isInCombat(player.getUniqueId())) {
-                    sender.sendMessage(PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getCant_do_that_during_combat()));
-                    return;
-                }
-            }
-            try {
-                Player player = Bukkit.getPlayer(args[1]);
-                String message = TogglePvp.getPlugin().getConfigCache().getPvp_enabled_other();
-                sender.sendMessage(PluginMessages.parsePlayerName(player, message));
-                TogglePvp.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), true);
-            } catch (NullPointerException e) {
-                sender.sendMessage(PluginMessages.parseMessage("&cPlayer offline."));
-            }
-        } else {
-            if (sender.hasPermission("togglepvp.command.toggle.others")) {
-                sender.sendMessage("Try /pvp enable <player>");
-            } else {
-                sender.sendMessage("Try /pvp enable");
-            }
-        }
-    }
-
-    public static void disable(CommandSender sender, String[] args) {
-        if (!sender.hasPermission("togglepvp.command.toggle")) {
-            String message = TogglePvp.getPlugin().getConfigCache().getNo_permission();
-            BaseComponent[] component = TextComponent.fromLegacyText(message);
-            sender.spigot().sendMessage(component);
-            return;
-        }
-        if (args.length == 1) {
-            if (sender instanceof Player) {
-                Player player = (Player) sender;
-                if (CombatTimer.isInCombat(player.getUniqueId())) {
-                    sender.sendMessage(PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getCant_do_that_during_combat()));
-                    return;
-                }
-                TogglePvp.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), false);
-                String message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_disabled());
-                BaseComponent[] component = TextComponent.fromLegacyText(message);
-                player.spigot().sendMessage(ChatMessageType.CHAT, component);
-            } else {
-                sender.sendMessage("Try /pvp disable <player>");
-            }
-        } else if (args.length == 2) {
-            if (!sender.hasPermission("togglepvp.command.toggle.others")) {
-                String message = TogglePvp.getPlugin().getConfigCache().getNo_permission();
-                BaseComponent[] component = TextComponent.fromLegacyText(message);
-                sender.spigot().sendMessage(component);
-                return;
-            }
-            if (sender instanceof Player) {
-                Player player = (Player) sender;
-                if (CombatTimer.isInCombat(player.getUniqueId())) {
-                    sender.sendMessage(PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getCant_do_that_during_combat()));
-                    return;
-                }
-            }
-            try {
-                Player player = Bukkit.getPlayer(args[1]);
-                String message = TogglePvp.getPlugin().getConfigCache().getPvp_disabled_other();
-                sender.sendMessage(PluginMessages.parsePlayerName(player, message));
-                TogglePvp.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), true);
-            } catch (NullPointerException e) {
-                sender.sendMessage(PluginMessages.parseMessage("&cPlayer offline."));
-            }
-        } else {
-            if (sender.hasPermission("togglepvp.command.toggle.others")) {
-                sender.sendMessage("Try /pvp disable <player>");
-            } else {
-                sender.sendMessage("Try /pvp disable");
-            }
-        }
-    }
-
-}

src/main/java/eu/endermite/togglepvp/commands/ReloadCommand.java

@@ -1,25 +0,0 @@
-package eu.endermite.togglepvp.commands;
-
-import eu.endermite.togglepvp.TogglePvp;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.TextComponent;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
-public class ReloadCommand {
-
-    public static void reload(CommandSender sender) {
-
-        Bukkit.getScheduler().runTaskAsynchronously(TogglePvp.getPlugin(), () -> {
-            if (!sender.hasPermission("togglepvp.command.reload")) {
-                String message = TogglePvp.getPlugin().getConfigCache().getNo_permission();
-                BaseComponent[] component = TextComponent.fromLegacyText(message);
-                sender.spigot().sendMessage(component);
-                return;
-            }
-            TogglePvp.getPlugin().reloadPluginConfig(sender);
-        });
-
-    }
-
-}

src/main/java/eu/endermite/togglepvp/config/ConfigCache.java

@@ -1,67 +0,0 @@
-package eu.endermite.togglepvp.config;
-
-import eu.endermite.togglepvp.TogglePvp;
-import lombok.Getter;
-import org.bukkit.configuration.Configuration;
-
-public class ConfigCache {
-
-    @Getter private final boolean pvp_enabled_by_default;
-    @Getter private final boolean lava_and_fire_stopper_enabled;
-    @Getter private final String pvp_enabled;
-    @Getter private final String pvp_disabled;
-    @Getter private final String cannot_attack_victim;
-    @Getter private final String cannot_attack_attacker;
-    @Getter private final String cannot_attack_pets_victim;
-    @Getter private final String cannot_attack_pets_attacker;
-    @Getter private final String no_permission;
-    @Getter private final String no_such_command;
-    @Getter private final String pvp_enabled_other;
-    @Getter private final String pvp_disabled_other;
-    @Getter private final double lava_and_fire_stopper_radius;
-    @Getter private final boolean channeling_enchant_disabled;
-    @Getter private final long cache_time;
-    @Getter private final long combat_time;
-    @Getter private final boolean punish_for_combat_logout;
-    @Getter private final boolean punish_for_combat_logout_announce;
-    @Getter private final String punish_for_combat_logout_message;
-    @Getter private final String entering_combat;
-    @Getter private final String leaving_combat;
-    @Getter final String cant_do_that_during_combat;
-
-    public ConfigCache() {
-
-        Configuration config = TogglePvp.getPlugin().getConfig();
-
-        // Settings
-        this.pvp_enabled_by_default = config.getBoolean("settings.pvp_enabled_by_default", false);
-
-        this.lava_and_fire_stopper_enabled = config.getBoolean("settings.lava_and_fire_stopper.enabled", true);
-        this.lava_and_fire_stopper_radius = config.getDouble("settings.lava_and_fire_stopper.radius", 2.5);
-
-        this.channeling_enchant_disabled = config.getBoolean("settings.channeling_enchant_disabled", true);
-
-        this.combat_time = config.getLong("settings.combat_time", 25L);
-        this.punish_for_combat_logout = config.getBoolean("settings.punish_for_combat_logout.enabled", true);
-        this.punish_for_combat_logout_announce = config.getBoolean("settings.punish_for_combat_logout.announce", true);
-        this.punish_for_combat_logout_message = config.getString("settings.punish_for_combat_logout.message", "&f%player% logged out while in combat. What a loser.");
-
-        this.cache_time = config.getLong("settings.cache_time", 30L);
-
-        // Messages
-        this.pvp_enabled = config.getString("messages.pvp_enabled", "&cYou enabled PvP!");
-        this.pvp_disabled = config.getString("messages.pvp_disabled", "&cYou disabled PvP!");
-        this.cannot_attack_victim = config.getString("messages.cannot_attack_victim", "&cYou can't attack players that have PvP turned off!");
-        this.cannot_attack_attacker = config.getString("messages.cannot_attack_attacker", "&cYou can't attack players while you have PvP turned off!");
-        this.cannot_attack_pets_victim = config.getString("messages.cannot_attack_pets_victim", "&cYou can't attack pets while you have PvP turned off");
-        this.cannot_attack_pets_attacker = config.getString("messages.cannot_attack_pets_attacker", "&cYou can't attack pets of players that have PvP turned off");
-        this.no_permission = config.getString("messages.no_permission", "&cYou don't have permission to use that.");
-        this.no_such_command = config.getString("messages.no_such_command", "&cNo such command.");
-        this.pvp_enabled_other = config.getString("messages.pvp_enabled_others", "&cYou've enabled %player%'s PvP.");
-        this.pvp_disabled_other = config.getString("messages.pvp_disabled_others", "&cYou've disabled %player%'s PvP.");
-        this.entering_combat = config.getString("messages.entering_combat", "&cEntering combat");
-        this.leaving_combat = config.getString("messages.leaving_combat", "&cLeaving combat");
-        this.cant_do_that_during_combat = config.getString("messages.cant_do_that_during_combat", "&cYou can't do that while in combat!");
-
-    }
-}

src/main/java/eu/endermite/togglepvp/listeners/player/PlayerAttackListener.java

@@ -1,47 +0,0 @@
-package eu.endermite.togglepvp.listeners.player;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-@eu.endermite.togglepvp.util.Listener
-public class PlayerAttackListener implements Listener {
-
-    /**
-     * Cancels basic attacks done to player with pvp off
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerAttack(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
-        Entity damagerEntity = event.getDamager();
-        Entity victimEntity = event.getEntity();
-
-        if (damagerEntity instanceof Player && victimEntity instanceof Player) {
-            Player damager = (Player) damagerEntity;
-            Player victim = (Player) victimEntity;
-
-            ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-
-            boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-            boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-
-            if (!damagerPvpEnabled) {
-                event.setCancelled(true);
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
-                return;
-            }
-            if (!victimPvpEnabled) {
-                event.setCancelled(true);
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                return;
-            }
-            CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
-        }
-    }
-
-}

src/main/java/eu/endermite/togglepvp/listeners/player/PlayerHitByFireworkListener.java

@@ -1,43 +0,0 @@
-package eu.endermite.togglepvp.listeners.player;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.Firework;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-@eu.endermite.togglepvp.util.Listener
-public class PlayerHitByFireworkListener implements Listener {
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onFireworkDamage(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
-        if (event.getDamager() instanceof Firework && event.getEntity() instanceof Player) {
-            Player victim = (Player) event.getEntity();
-            Firework firework = (Firework) event.getDamager();
-            if (firework.getShooter() instanceof Player) {
-                Player damager = (Player) firework.getShooter();
-                if (damager == victim) {
-                    return;
-                }
-                boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                if (!damagerPvpEnabled) {
-                    event.setCancelled(true);
-                    PluginMessages.sendActionBar(damager.getUniqueId(), TogglePvp.getPlugin().getConfigCache().getCannot_attack_attacker());
-                    return;
-                }
-                boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                if (!victimPvpEnabled) {
-                    event.setCancelled(true);
-                    PluginMessages.sendActionBar(damager.getUniqueId(), TogglePvp.getPlugin().getConfigCache().getCannot_attack_victim());
-                    return;
-                }
-                CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
-            }
-        }
-    }
-
-
-}

src/main/java/eu/endermite/togglepvp/listeners/player/PlayerHitByProjectileListener.java

@@ -1,50 +0,0 @@
-package eu.endermite.togglepvp.listeners.player;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-@eu.endermite.togglepvp.util.Listener
-public class PlayerHitByProjectileListener implements Listener {
-
-    /**
-     * Cancels damage done by projectiles to player with pvp off
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerHitProjectile(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
-
-        if (event.getEntity() instanceof Player && event.getDamager() instanceof Projectile) {
-            Projectile projectile = (Projectile) event.getDamager();
-            if (projectile.getShooter() instanceof Player) {
-                Player damager = (Player) projectile.getShooter();
-                Player victim = (Player) event.getEntity();
-
-                // Ender pearls and other self-damage
-                if (damager == victim) {
-                    return;
-                }
-                ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-                boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-                boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                if (!damagerPvpEnabled) {
-                    event.setCancelled(true);
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
-                    return;
-                }
-                if (!victimPvpEnabled) {
-                    event.setCancelled(true);
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                    return;
-                }
-                CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
-            }
-        }
-    }
-
-}

src/main/java/eu/endermite/togglepvp/listeners/player/PlayerHitBySplashPotionListener.java

@@ -1,68 +0,0 @@
-package eu.endermite.togglepvp.listeners.player;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-
-@eu.endermite.togglepvp.util.Listener
-public class PlayerHitBySplashPotionListener implements Listener {
-
-    /**
-     * If thrown potion is applies negative effects and it's thrown by a player it will ahve no effect on player with pvp off
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerHitBySplashPotion(org.bukkit.event.entity.PotionSplashEvent event) {
-
-        if (!(event.getEntity().getShooter() instanceof Player))
-            return;
-
-        boolean harmful = false;
-
-        for (PotionEffect effect : event.getPotion().getEffects()) {
-            if (effect.getType().equals(PotionEffectType.BLINDNESS) ||
-                    effect.getType().equals(PotionEffectType.CONFUSION) ||
-                    effect.getType().equals(PotionEffectType.HARM) ||
-                    effect.getType().equals(PotionEffectType.HUNGER) ||
-                    effect.getType().equals(PotionEffectType.POISON) ||
-                    effect.getType().equals(PotionEffectType.SLOW_DIGGING) ||
-                    effect.getType().equals(PotionEffectType.WEAKNESS) ||
-                    effect.getType().equals(PotionEffectType.SLOW) ||
-                    effect.getType().equals(PotionEffectType.WITHER)) {
-                    harmful = true;
-            }
-        }
-        if (!harmful)
-            return;
-        for (Entity entity : event.getAffectedEntities()) {
-            if (entity instanceof Player) {
-                Player damager = (Player) event.getEntity().getShooter();
-                Player victim = (Player) entity;
-                if (damager == victim)
-                    continue;
-
-                ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-                boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-                if (!damagerPvpEnabled) {
-                    event.setIntensity(victim, 0);
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
-                    continue;
-                }
-                boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                if (!victimPvpEnabled) {
-                    event.setIntensity(victim, 0);
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                    continue;
-                }
-                CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
-            }
-        }
-    }
-}

src/main/java/eu/endermite/togglepvp/listeners/player/PlayerJoinAndLeaveListener.java

@@ -1,43 +0,0 @@
-package eu.endermite.togglepvp.listeners.player;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.players.PlayerData;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import java.time.Instant;
-
-@eu.endermite.togglepvp.util.Listener
-public class PlayerJoinAndLeaveListener implements Listener {
-    /**
-     * This event is here to get players saved options on join
-     */
-    @EventHandler(ignoreCancelled = true)
-    public void onPlayerJoin(org.bukkit.event.player.PlayerJoinEvent event) {
-        Player player = event.getPlayer();
-
-        PlayerData playerData = TogglePvp.getPlugin().getSqLite().getPlayerInfo(player.getUniqueId());
-        TogglePvp.getPlugin().getPlayerManager().addPlayer(player.getUniqueId(), playerData);
-    }
-    /**
-     * This event is here to dump player's saved options from memory
-     * Also punishes players who log out during combat
-     */
-    @EventHandler
-    public void onPlayerLeave(org.bukkit.event.player.PlayerQuitEvent event) {
-        Player player = event.getPlayer();
-        TogglePvp.getPlugin().getSqLite().updatePlayerInfo(player.getUniqueId(), TogglePvp.getPlugin().getPlayerManager().getPlayer(player.getUniqueId()));
-        if (TogglePvp.getPlugin().getConfigCache().isPunish_for_combat_logout()) {
-            long now = Instant.now().getEpochSecond();
-            long combatTime = TogglePvp.getPlugin().getPlayerManager().getPlayer(player.getUniqueId()).getCombattime();
-            if (combatTime > now) {
-                player.setHealth(0);
-                if (TogglePvp.getPlugin().getConfigCache().isPunish_for_combat_logout_announce()) {
-                    PluginMessages.broadcastMessage(player, TogglePvp.getPlugin().getConfigCache().getPunish_for_combat_logout_message());
-                }
-                TogglePvp.getPlugin().getPlayerManager().getPlayer(player.getUniqueId()).setCombattime(now-1);
-            }
-        }
-    }
-}

src/main/java/eu/endermite/togglepvp/listeners/player/WolfAttackPlayerListener.java

@@ -1,39 +0,0 @@
-package eu.endermite.togglepvp.listeners.player;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.players.SmartCache;
-import eu.endermite.togglepvp.util.CombatTimer;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-@eu.endermite.togglepvp.util.Listener
-public class WolfAttackPlayerListener implements Listener {
-
-    /**
-     * Wolves stop following player with pvp off after trying to hit them
-     * This is to fix any inconsistancy with wolf behaviour
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onWolfAttack(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
-        if (event.getDamager() instanceof Wolf) {
-            Wolf wolf = (Wolf) event.getDamager();
-            if (wolf.getOwner() != null && event.getEntity() instanceof Player) {
-                try {
-                    boolean damagerPvpEnabled = SmartCache.getPlayerData(wolf.getOwner().getUniqueId()).isPvpEnabled();
-                    Player victim = (Player) event.getEntity();
-                    boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                    if (!victimPvpEnabled || !damagerPvpEnabled) {
-                        wolf.setAngry(false);
-                        event.setCancelled(true);
-                        return;
-                    }
-                    CombatTimer.refreshPlayersCombatTime(wolf.getOwner().getUniqueId(), victim.getUniqueId());
-                } catch (NullPointerException ignored) {}
-            }
-        }
-    }
-
-}

src/main/java/eu/endermite/togglepvp/listeners/unspecific/AreaEffectCloudApplyListener.java

@@ -1,87 +0,0 @@
-package eu.endermite.togglepvp.listeners.unspecific;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.players.SmartCache;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.AreaEffectCloudApplyEvent;
-import org.bukkit.potion.PotionEffectType;
-import java.util.Iterator;
-
-@eu.endermite.togglepvp.util.Listener
-public class AreaEffectCloudApplyListener implements Listener {
-
-    @EventHandler(ignoreCancelled = true)
-    public void onCloudEffects(AreaEffectCloudApplyEvent event) {
-
-        PotionEffectType potionEffectType = event.getEntity().getBasePotionData().getType().getEffectType();
-
-        if (potionEffectType == null)
-            return;
-
-        if(event.getEntity().getSource() instanceof Player) {
-            if (potionEffectType.equals(PotionEffectType.BLINDNESS) ||
-                    potionEffectType.equals(PotionEffectType.CONFUSION) ||
-                    potionEffectType.equals(PotionEffectType.HARM) ||
-                    potionEffectType.equals(PotionEffectType.HUNGER) ||
-                    potionEffectType.equals(PotionEffectType.POISON) ||
-                    potionEffectType.equals(PotionEffectType.SLOW_DIGGING) ||
-                    potionEffectType.equals(PotionEffectType.WEAKNESS) ||
-                    potionEffectType.equals(PotionEffectType.SLOW) ||
-                    potionEffectType.equals(PotionEffectType.WITHER)) {
-
-                Iterator<LivingEntity> it = event.getAffectedEntities().iterator();
-                Player damager = (Player) event.getEntity().getSource();
-                while(it.hasNext()) {
-                    LivingEntity entity = it.next();
-                    if(entity instanceof Player) {
-
-                        Player victim = (Player) entity;
-                        if (damager == victim)
-                            continue;
-
-                        ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-                        boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-                        if (!damagerPvpEnabled) {
-                            it.remove();
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
-                            continue;
-                        }
-                        boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                        if (!victimPvpEnabled) {
-                            it.remove();
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                            continue;
-                        }
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
-                    } else if (entity instanceof Wolf) {
-                        Wolf victim = (Wolf) entity;
-                        if (victim.getOwner() == null || victim.getOwner() == damager) {
-                            return;
-                        }
-                        ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-                        boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-                        if (!damagerPvpEnabled) {
-                            it.remove();
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
-                            continue;
-                        }
-                        boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
-                        if (!victimPvpEnabled) {
-                            it.remove();
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
-                            continue;
-                        }
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
-                    }
-                }
-            }
-        }
-    }
-}

src/main/java/eu/endermite/togglepvp/listeners/unspecific/FishingListener.java

@@ -1,64 +0,0 @@
-package eu.endermite.togglepvp.listeners.unspecific;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.players.SmartCache;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-@eu.endermite.togglepvp.util.Listener
-public class FishingListener implements Listener {
-
-    ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-
-    /**
-     * Prevents hooking players with disabled pvp with fishing rod
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onFish(org.bukkit.event.player.PlayerFishEvent event) {
-        if (event.getCaught() instanceof Player) {
-            Player damager = event.getPlayer();
-            Player victim = (Player) event.getCaught();
-            if (damager == victim) {
-                return;
-            }
-            boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-            if (!damagerPvpEnabled) {
-                event.setCancelled(true);
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
-                return;
-            }
-            boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-            if (!victimPvpEnabled) {
-                event.setCancelled(true);
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                return;
-            }
-            CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
-        } else if (event.getCaught() instanceof Wolf) {
-            Wolf victim = (Wolf) event.getCaught();
-            Player damager = event.getPlayer();
-            if (victim.getOwner() == null || victim.getOwner() == damager) {
-                return;
-            }
-            boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-            if (!damagerPvpEnabled) {
-                event.setCancelled(true);
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
-                return;
-            }
-            boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
-            if (!victimPvpEnabled) {
-                event.setCancelled(true);
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                return;
-            }
-            CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
-        }
-    }
-}

src/main/java/eu/endermite/togglepvp/listeners/unspecific/LavaDumpAndIgniteListener.java

@@ -1,138 +0,0 @@
-package eu.endermite.togglepvp.listeners.unspecific;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.players.SmartCache;
-import eu.endermite.togglepvp.util.BoundingBoxUtil;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.util.BoundingBox;
-
-
-@eu.endermite.togglepvp.util.Listener
-public class LavaDumpAndIgniteListener implements Listener {
-
-    private ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-
-    /**
-     * Prevents dumping lava and pufferfish bucket near players with pvp off
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onLavaDump(org.bukkit.event.player.PlayerBucketEmptyEvent event) {
-
-        if (!TogglePvp.getPlugin().getConfigCache().isLava_and_fire_stopper_enabled())
-            return;
-
-        if (event.getBucket().equals(Material.LAVA_BUCKET) || event.getBucket().equals(Material.PUFFERFISH_BUCKET)) {
-            Location location = event.getBlockClicked().getLocation();
-            Player damager = event.getPlayer();
-            double radius = config.getLava_and_fire_stopper_radius();
-            BoundingBox boundingBox = BoundingBoxUtil.getBoundingBox(location, radius);
-            for (Entity entity : location.getWorld().getNearbyEntities(boundingBox)) {
-                if (entity instanceof Player) {
-                    Player victim = (Player) entity;
-                    if (victim != damager) {
-                        boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-                        if (!damagerPvpEnabled) {
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
-                            event.setCancelled(true);
-                            return;
-                        }
-                        boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                        if (!victimPvpEnabled) {
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                            event.setCancelled(true);
-                            return;
-                        }
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
-                    }
-                } else if (entity instanceof Wolf) {
-                    Wolf victim = (Wolf) entity;
-                    if (victim.getOwner() == null) {
-                        return;
-                    }
-                    boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-                    if (!damagerPvpEnabled) {
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
-                        event.setCancelled(true);
-                        return;
-                    }
-                    try {
-                        boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
-                        if (!victimPvpEnabled) {
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
-                            event.setCancelled(true);
-                            return;
-                        }
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
-                    } catch (NullPointerException ignored) {}
-                }
-            }
-        }
-    }
-
-    /**
-     * Prevents setting blocks on fire near players with pvp off
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onIgnite(org.bukkit.event.block.BlockIgniteEvent event) {
-
-        if (!TogglePvp.getPlugin().getConfigCache().isLava_and_fire_stopper_enabled())
-            return;
-
-        if (event.getPlayer() !=null) {
-            Location location = event.getBlock().getLocation();
-            Player damager = event.getPlayer();
-            double radius = config.getLava_and_fire_stopper_radius();
-            BoundingBox boundingBox = BoundingBoxUtil.getBoundingBox(location, radius);
-            for (Entity entity : location.getWorld().getNearbyEntities(boundingBox)) {
-                if (entity instanceof Player) {
-                    Player victim = (Player) entity;
-                    if (victim != damager) {
-                        boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-                        if (!damagerPvpEnabled) {
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
-                            event.setCancelled(true);
-                            return;
-                        }
-                        boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                        if (!victimPvpEnabled) {
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                            event.setCancelled(true);
-                            return;
-                        }
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
-                    }
-                } else if (entity instanceof Wolf) {
-                    Wolf victim = (Wolf) entity;
-                    if (victim.getOwner() == null || victim.getOwner() == damager) {
-                        return;
-                    }
-                    boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-                    if (!damagerPvpEnabled) {
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
-                        event.setCancelled(true);
-                        return;
-                    }
-                    try {
-                        boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
-                        if (!victimPvpEnabled) {
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
-                            event.setCancelled(true);
-                            return;
-                        }
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
-                    } catch (NullPointerException ignored) {}
-                }
-            }
-        }
-    }
-}

src/main/java/eu/endermite/togglepvp/listeners/unspecific/PlaceWitherRoseListener.java

@@ -1,75 +0,0 @@
-package eu.endermite.togglepvp.listeners.unspecific;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.players.SmartCache;
-import eu.endermite.togglepvp.util.BoundingBoxUtil;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.util.BoundingBox;
-
-@eu.endermite.togglepvp.util.Listener
-public class PlaceWitherRoseListener implements Listener {
-
-    private ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerWitherRosePlace(org.bukkit.event.block.BlockPlaceEvent event) {
-        if (!TogglePvp.getPlugin().getConfigCache().isLava_and_fire_stopper_enabled())
-            return;
-
-        if(event.getBlock().getType().equals(Material.WITHER_ROSE)) {
-            Location location = event.getBlockPlaced().getLocation();
-            double radius = config.getLava_and_fire_stopper_radius();
-            BoundingBox boundingBox = BoundingBoxUtil.getBoundingBox(location, radius);
-            for (Entity entity : location.getWorld().getNearbyEntities(boundingBox)) {
-                if (entity instanceof Player) {
-                    Player damager = event.getPlayer();
-                    Player victim = (Player) entity;
-                    if (victim != damager) {
-                        boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-                        if (!damagerPvpEnabled) {
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
-                            event.setCancelled(true);
-                            return;
-                        }
-                        boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                        if (!victimPvpEnabled) {
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                            event.setCancelled(true);
-                            return;
-                        }
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
-                    }
-                } else if (entity instanceof Wolf) {
-                    Wolf victim = (Wolf) entity;
-                    Player damager = event.getPlayer();
-                    if (victim.getOwner() == null || victim.getOwner() == damager) {
-                        return;
-                    }
-                    boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-                    if (!damagerPvpEnabled) {
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
-                        event.setCancelled(true);
-                        return;
-                    }
-                    boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
-                    if (!victimPvpEnabled) {
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
-                        event.setCancelled(true);
-                        return;
-                    }
-                    CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
-                }
-            }
-        }
-    }
-}

src/main/java/eu/endermite/togglepvp/listeners/wolf/PlayerAttackWolfListener.java

@@ -1,47 +0,0 @@
-package eu.endermite.togglepvp.listeners.wolf;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.players.SmartCache;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-@eu.endermite.togglepvp.util.Listener
-public class PlayerAttackWolfListener implements Listener {
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerAttackWolf(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
-
-        if (event.getDamager() instanceof Player && event.getEntity() instanceof Wolf) {
-            Wolf wolf = (Wolf) event.getEntity();
-            if (wolf.getOwner() != null) {
-                Player damager = (Player) event.getDamager();
-
-                if (damager.getUniqueId() == wolf.getOwner().getUniqueId()) {
-                    return;
-                }
-
-                ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-                boolean damagerPvpState = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-
-                if (!damagerPvpState) {
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
-                    event.setCancelled(true);
-                    return;
-                }
-                boolean victimPvpEnabled = SmartCache.getPlayerData(wolf.getOwner().getUniqueId()).isPvpEnabled();
-                if (!victimPvpEnabled) {
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
-                    event.setCancelled(true);
-                    return;
-                }
-                CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), wolf.getOwner().getUniqueId());
-            }
-        }
-    }
-}

src/main/java/eu/endermite/togglepvp/listeners/wolf/PlayerHitWolfWithProjectile.java

@@ -1,48 +0,0 @@
-package eu.endermite.togglepvp.listeners.wolf;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.players.SmartCache;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-@eu.endermite.togglepvp.util.Listener
-public class PlayerHitWolfWithProjectile implements Listener {
-
-    /**
-     * Cancels damage done by projectiles to pets of players with pvp off
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerHitWolfWithProjectile(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
-        if (event.getEntity() instanceof Wolf && event.getDamager() instanceof Projectile) {
-            Projectile projectile = (Projectile) event.getDamager();
-            if (projectile.getShooter() instanceof Player) {
-                Wolf victim = (Wolf) event.getEntity();
-                Player damager = (Player) projectile.getShooter();
-                if (victim.getOwner() == null || victim.getOwner() == damager) {
-                    return;
-                }
-                ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-                boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-                boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
-                if (!damagerPvpEnabled) {
-                    event.setCancelled(true);
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
-                    return;
-                }
-                if (!victimPvpEnabled) {
-                    event.setCancelled(true);
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
-                    return;
-                }
-                CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
-            }
-        }
-    }
-}

src/main/java/eu/endermite/togglepvp/listeners/wolf/WolfHitByExplosionListener.java

@@ -1,53 +0,0 @@
-package eu.endermite.togglepvp.listeners.wolf;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.players.SmartCache;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityDamageEvent;
-import java.util.UUID;
-
-@eu.endermite.togglepvp.util.Listener
-public class WolfHitByExplosionListener implements Listener {
-
-    /**
-     * Cancels explosion damage for wolves with pvp off that is caused by players
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerHitByExplosion(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
-        if (event.getEntity() instanceof Wolf) {
-            if (!event.getCause().equals(EntityDamageEvent.DamageCause.ENTITY_EXPLOSION)) {
-                return;
-            }
-            Wolf victim = (Wolf) event.getEntity();
-            if (victim.getOwner() == null) {
-                return;
-            }
-            try {
-                UUID damageruuid = UUID.fromString(event.getDamager().getMetadata("PLAYEREXPLODED").get(0).asString());
-                if (victim.getOwner().getUniqueId() == damageruuid) {
-                    return;
-                }
-                ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-                boolean damagerPvpEnabled = SmartCache.getPlayerData(damageruuid).isPvpEnabled();
-                if (!damagerPvpEnabled) {
-                    PluginMessages.sendActionBar(damageruuid, config.getCannot_attack_pets_attacker());
-                    event.setCancelled(true);
-                    return;
-                }
-                boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
-                if (!victimPvpEnabled) {
-                    PluginMessages.sendActionBar(damageruuid, config.getCannot_attack_pets_victim());
-                    event.setCancelled(true);
-                    return;
-                }
-                CombatTimer.refreshPlayersCombatTime(damageruuid, victim.getOwner().getUniqueId());
-            } catch (NullPointerException | IndexOutOfBoundsException ignored) {}
-        }
-    }
-}

src/main/java/eu/endermite/togglepvp/listeners/wolf/WolfHitByFireworkListener.java

@@ -1,43 +0,0 @@
-package eu.endermite.togglepvp.listeners.wolf;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.Firework;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-@eu.endermite.togglepvp.util.Listener
-public class WolfHitByFireworkListener implements Listener {
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onFireworkDamage(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
-        if (event.getDamager() instanceof Firework && event.getEntity() instanceof Wolf) {
-            Wolf victim = (Wolf) event.getEntity();
-            if (victim.getOwner() == null)
-                return;
-            Firework firework = (Firework) event.getDamager();
-            if (firework.getShooter() instanceof Player) {
-                Player damager = (Player) firework.getShooter();
-                if (victim.getOwner() == damager)
-                    return;
-                boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getOwner().getUniqueId());
-                if (!damagerPvpEnabled) {
-                    event.setCancelled(true);
-                    PluginMessages.sendActionBar(damager.getUniqueId(), TogglePvp.getPlugin().getConfigCache().getCannot_attack_pets_attacker());
-                    return;
-                }
-                boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                if (!victimPvpEnabled) {
-                    event.setCancelled(true);
-                    PluginMessages.sendActionBar(damager.getUniqueId(), TogglePvp.getPlugin().getConfigCache().getCannot_attack_pets_victim());
-                    return;
-                }
-                CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
-            }
-        }
-    }
-}

src/main/java/eu/endermite/togglepvp/listeners/wolf/WolfHitBySplashPotionListener.java

@@ -1,72 +0,0 @@
-package eu.endermite.togglepvp.listeners.wolf;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.players.SmartCache;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-
-@eu.endermite.togglepvp.util.Listener
-public class WolfHitBySplashPotionListener implements Listener {
-
-    /**
-     * If thrown potion applies negative effects and it's thrown by a player
-     * it will have no effect on a pet of a player with pvp off
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onWolfHitBySplashPotion(org.bukkit.event.entity.PotionSplashEvent event) {
-
-        if (!(event.getEntity().getShooter() instanceof Player))
-            return;
-
-        boolean harmful = false;
-
-        for (PotionEffect effect : event.getPotion().getEffects()) {
-            if (effect.getType().equals(PotionEffectType.BLINDNESS) ||
-                    effect.getType().equals(PotionEffectType.CONFUSION) ||
-                    effect.getType().equals(PotionEffectType.HARM) ||
-                    effect.getType().equals(PotionEffectType.HUNGER) ||
-                    effect.getType().equals(PotionEffectType.POISON) ||
-                    effect.getType().equals(PotionEffectType.SLOW_DIGGING) ||
-                    effect.getType().equals(PotionEffectType.WEAKNESS) ||
-                    effect.getType().equals(PotionEffectType.SLOW) ||
-                    effect.getType().equals(PotionEffectType.WITHER)) {
-                harmful = true;
-            }
-        }
-        if (!harmful)
-            return;
-        for (Entity entity : event.getAffectedEntities()) {
-            if (entity instanceof Wolf) {
-                Player damager = (Player) event.getEntity().getShooter();
-                Wolf victim = (Wolf) entity;
-                if (victim.getOwner() == null || victim.getOwner() == damager)
-                    continue;
-
-                ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-                boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
-                if (!damagerPvpEnabled) {
-                    event.setIntensity(victim, 0);
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
-                    continue;
-                }
-                boolean victimPvpEnabled = (boolean) SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
-                if (!victimPvpEnabled) {
-                    event.setIntensity(victim, 0);
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                    continue;
-                }
-                CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
-            }
-        }
-    }
-
-}

src/main/java/eu/endermite/togglepvp/listeners/wolf/WolfLeashListener.java

@@ -1,42 +0,0 @@
-package eu.endermite.togglepvp.listeners.wolf;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.players.SmartCache;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-@eu.endermite.togglepvp.util.Listener
-public class WolfLeashListener implements Listener {
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onWolfLeash(org.bukkit.event.entity.PlayerLeashEntityEvent event) {
-        if (event.getEntity() instanceof Wolf) {
-            Wolf victim = (Wolf) event.getEntity();
-            if (victim.getOwner() == null) {
-                return;
-            }
-            Player damager = event.getPlayer();
-            if (victim.getOwner() == damager) {
-                return;
-            }
-            ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-            boolean damagerPvpEnabled = SmartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled();
-            if (!damagerPvpEnabled) {
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
-                event.setCancelled(true);
-                return;
-            }
-            boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
-            if (!victimPvpEnabled) {
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
-                event.setCancelled(true);
-            }
-        }
-    }
-
-}

src/main/java/eu/endermite/togglepvp/listeners/wolf/WolfTargettingPlayerListener.java

@@ -1,32 +0,0 @@
-package eu.endermite.togglepvp.listeners.wolf;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.players.SmartCache;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-@eu.endermite.togglepvp.util.Listener
-public class WolfTargettingPlayerListener implements Listener {
-    /**
-     * Stops wolves with owners targetting players with pvp off
-     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onWolfTarget(org.bukkit.event.entity.EntityTargetEvent event) {
-        if (event.getEntity() instanceof Wolf) {
-            Wolf wolf = (Wolf) event.getEntity();
-            if (wolf.getOwner() != null) {
-                if (event.getTarget() instanceof Player) {
-                    boolean attackerPvPEnabled = SmartCache.getPlayerData(wolf.getOwner().getUniqueId()).isPvpEnabled();
-                    Player victim = (Player) event.getTarget();
-                    boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                    if (!attackerPvPEnabled || !victimPvpEnabled) {
-                        event.setCancelled(true);
-                    }
-                }
-            }
-        }
-    }
-}

src/main/java/eu/endermite/togglepvp/listeners/wolf/WolfTargettingWolfListener.java

@@ -1,32 +0,0 @@
-package eu.endermite.togglepvp.listeners.wolf;
-
-import eu.endermite.togglepvp.players.SmartCache;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-@eu.endermite.togglepvp.util.Listener
-public class WolfTargettingWolfListener implements Listener {
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onWolfAttackWolf(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
-        if (event.getDamager() instanceof Wolf && event.getEntity() instanceof Wolf) {
-            Wolf damager = (Wolf) event.getDamager();
-            Wolf victim = (Wolf) event.getEntity();
-            if (damager.getOwner() != null && damager.getOwner() != null) {
-                try {
-                    boolean damagerPvpEnabled = SmartCache.getPlayerData(damager.getOwner().getUniqueId()).isPvpEnabled();
-                    boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
-                    if (!victimPvpEnabled || !damagerPvpEnabled) {
-                        damager.setAngry(false);
-                        event.setCancelled(true);
-                    }
-                } catch (NullPointerException e) {
-                    return;
-                }
-            }
-        }
-    }
-
-}

src/main/java/eu/endermite/togglepvp/players/PlayerData.java

@@ -1,45 +0,0 @@
-package eu.endermite.togglepvp.players;
-
-import eu.endermite.togglepvp.TogglePvp;
-
-import java.time.Instant;
-
-public class PlayerData {
-
-    private long cachetime, combattime;
-    private boolean pvpEnabled;
-
-    public PlayerData(boolean pvpEnabled) {
-        this.pvpEnabled = pvpEnabled;
-        this.combattime = Instant.now().getEpochSecond()-1;
-        refreshCachetime();
-    }
-
-    public boolean isPvpEnabled() {
-        return pvpEnabled;
-    }
-
-    public void setPvpEnabled(boolean pvpEnabled) {
-        this.pvpEnabled = pvpEnabled;
-    }
-
-    public long getCachetime() {
-        return cachetime;
-    }
-
-    public void refreshCachetime() {
-        this.cachetime = Instant.now().getEpochSecond()+ TogglePvp.getPlugin().getConfigCache().getCache_time();
-    }
-
-    public long getCombattime() {
-        return combattime;
-    }
-
-    public void setCombattime(long combattime) {
-        this.combattime = combattime;
-    }
-
-    public void refreshCombatTime() {
-        this.combattime = Instant.now().getEpochSecond()+ TogglePvp.getPlugin().getConfigCache().getCombat_time();
-    }
-}

src/main/java/eu/endermite/togglepvp/players/PlayerManager.java

@@ -1,61 +0,0 @@
-package eu.endermite.togglepvp.players;
-
-import eu.endermite.togglepvp.TogglePvp;
-import lombok.Getter;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import java.util.HashMap;
-import java.util.UUID;
-
-public class PlayerManager {
-
-    @Getter HashMap<UUID, PlayerData> playerList = new HashMap<>();
-
-    public PlayerManager() {
-        for (Player p : Bukkit.getOnlinePlayers()) {
-            PlayerData playerData = TogglePvp.getPlugin().getSqLite().getPlayerInfo(p.getUniqueId());
-            playerList.put(p.getUniqueId(), playerData);
-        }
-    }
-
-    public void refreshPlayersCacheTime(UUID uuid) {
-        playerList.get(uuid).refreshCachetime();
-    }
-
-    public void refreshPlayersCombatTime(UUID uuid) {
-        try {
-            playerList.get(uuid).refreshCombatTime();
-        } catch (Exception ignored) {}
-    }
-
-    public PlayerData getPlayer(UUID uuid) {
-        return playerList.get(uuid);
-    }
-
-    public void addPlayer(UUID uuid, PlayerData data) {
-        playerList.put(uuid, data);
-    }
-
-    public void removePlayer(UUID uuid) {
-        playerList.remove(uuid);
-    }
-
-    public boolean getPlayerPvPState(UUID uuid) {
-        return playerList.get(uuid).isPvpEnabled();
-    }
-
-    public void setPlayerPvpState(UUID uuid, boolean state) {
-        playerList.get(uuid).setPvpEnabled(state);
-    }
-
-    public boolean togglePlayerPvpState(UUID uuid) {
-        boolean currentState = playerList.get(uuid).isPvpEnabled();
-        if (currentState) {
-            playerList.get(uuid).setPvpEnabled(false);
-            return false;
-        } else {
-            playerList.get(uuid).setPvpEnabled(true);
-            return true;
-        }
-    }
-}

src/main/java/eu/endermite/togglepvp/players/SmartCache.java

@@ -1,60 +0,0 @@
-package eu.endermite.togglepvp.players;
-
-import eu.endermite.togglepvp.TogglePvp;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import java.time.Instant;
-import java.util.Map;
-import java.util.UUID;
-
-public class SmartCache {
-
-    public static void runSmartCache() {
-        Bukkit.getScheduler().runTaskTimerAsynchronously(TogglePvp.getPlugin(), () -> {
-            // Refresh cache timer if player is online
-            for (Map.Entry<UUID, PlayerData> e : TogglePvp.getPlugin().getPlayerManager().getPlayerList().entrySet()) {
-                try {
-                    Player player = Bukkit.getPlayer(e.getKey());
-                    if (player != null && player.isOnline()) {
-                        TogglePvp.getPlugin().getPlayerManager().refreshPlayersCacheTime(e.getKey());
-                    }
-                } catch (NullPointerException ignored) {}
-            }
-            // Check for entries that should be invalidated
-            try {
-                long now = Instant.now().getEpochSecond();
-                TogglePvp.getPlugin().getPlayerManager().getPlayerList().entrySet()
-                        .removeIf(cacheEntry -> cacheEntry.getValue().getCachetime() < now);
-            } catch (Exception ignored) {}
-        }, 100, 100);
-    }
-
-    public static PlayerData getPlayerData(UUID uuid) {
-        // Try to get data from cache and refresh it
-        try {
-            TogglePvp.getPlugin().getPlayerManager().refreshPlayersCacheTime(uuid);
-            return TogglePvp.getPlugin().getPlayerManager().getPlayer(uuid);
-        } catch (NullPointerException e) {
-            // If player data is not in cache get it from database and put into cache
-            try {
-                PlayerData playerData = TogglePvp.getPlugin().getSqLite().getPlayerInfo(uuid);
-                TogglePvp.getPlugin().getPlayerManager().addPlayer(uuid, playerData);
-                return playerData;
-            } catch (NullPointerException ex) {
-                // Return false if database call fails
-                return new PlayerData(false);
-            }
-        }
-    }
-
-    public static void setPlayerPvpState(UUID uuid, boolean state) {
-        // If player is in cache update that
-        if (TogglePvp.getPlugin().getPlayerManager().getPlayer(uuid) != null) {
-            TogglePvp.getPlugin().getPlayerManager().getPlayer(uuid).setPvpEnabled(state);
-        }
-        // Update the database aswell
-        TogglePvp.getPlugin().getSqLite().updatePlayerInfo(uuid, new PlayerData(state));
-    }
-
-
-}

src/main/java/eu/endermite/togglepvp/util/CombatTimer.java

@@ -1,36 +0,0 @@
-package eu.endermite.togglepvp.util;
-
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.players.SmartCache;
-import java.time.Instant;
-import java.util.UUID;
-
-public class CombatTimer {
-
-    public static void refreshPlayersCombatTime(UUID uuid) {
-        try {
-            long now = Instant.now().getEpochSecond();
-            long combattime = SmartCache.getPlayerData(uuid).getCombattime();
-            if (combattime < now) {
-                PluginMessages.sendActionBar(uuid, TogglePvp.getPlugin().getConfigCache().getEntering_combat());
-            }
-            TogglePvp.getPlugin().getPlayerManager().refreshPlayersCombatTime(uuid);
-        } catch (Exception ignored) {}
-    }
-
-    public static void refreshPlayersCombatTime(UUID attacker_uuid, UUID victim_uuid) {
-        refreshPlayersCombatTime(attacker_uuid);
-        refreshPlayersCombatTime(victim_uuid);
-    }
-
-    public static boolean isInCombat(UUID uuid) {
-        try {
-            long combattimer = SmartCache.getPlayerData(uuid).getCombattime();
-            long now = Instant.now().getEpochSecond();
-            return combattimer > now;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-}

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

@@ -1,46 +1,52 @@
-package eu.endermite.togglepvp;
+package me.youhavetrouble.preventstabby;
 
-import eu.endermite.togglepvp.commands.MainCommand;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.players.PlayerManager;
-import eu.endermite.togglepvp.players.SmartCache;
-import eu.endermite.togglepvp.util.Listener;
-import eu.endermite.togglepvp.util.DatabaseSQLite;
+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;
+import me.youhavetrouble.preventstabby.util.DatabaseSQLite;
 import lombok.Getter;
+import me.youhavetrouble.preventstabby.util.Util;
+import org.bstats.bukkit.Metrics;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.reflections.Reflections;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
-import java.util.Objects;
 import java.util.Set;
 
-public final class TogglePvp extends JavaPlugin {
+public final class PreventStabby extends JavaPlugin {
 
-    @Getter private static TogglePvp plugin;
+    @Getter private static PreventStabby plugin;
     private ConfigCache configCache;
     private PlayerManager playerManager;
     private DatabaseSQLite sqLite;
+    private SmartCache smartCache;
 
     @Override
     public void onEnable() {
         plugin = this;
+        Util.initData();
         reloadPluginConfig();
-        File dbFile = new File("plugins/TogglePvP");
-        sqLite = new DatabaseSQLite("jdbc:sqlite:plugins/TogglePvP/TogglePvP.db", dbFile);
+        File dbFile = new File("plugins/PreventStabby");
+        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.");
             getLogger().severe("Plugin will now disable.");
             getServer().getPluginManager().disablePlugin(this);
+            return;
         }
         playerManager = new PlayerManager();
-
-        SmartCache.runSmartCache();
+        smartCache = new SmartCache();
+        smartCache.runSmartCache();
 
         // Register listeners
-        Reflections reflections = new Reflections(new String[]{"eu.endermite.togglepvp"});
-        Set<Class<?>> listenerClasses = reflections.getTypesAnnotatedWith(Listener.class);
+        Reflections reflections = new Reflections(new String[]{"me.youhavetrouble.preventstabby"});
+        Set<Class<?>> listenerClasses = reflections.getTypesAnnotatedWith(PreventStabbyListener.class);
         listenerClasses.forEach((listener)-> {
             try {
                 getServer().getPluginManager().registerEvents((org.bukkit.event.Listener) listener.getConstructor().newInstance(), this);
@@ -53,20 +59,31 @@ public final class TogglePvp extends JavaPlugin {
         });
 
         // Register command
-        Objects.requireNonNull(getCommand("pvp")).setExecutor(new MainCommand());
-        Objects.requireNonNull(getCommand("pvp")).setTabCompleter(new MainCommand());
+        PluginCommand pvpCommand = getCommand("pvp");
+        if (pvpCommand == null) {
+            getLogger().severe("Error with registering commands.");
+            getLogger().severe("Plugin will now disable.");
+            getServer().getPluginManager().disablePlugin(this);
+        }
+        MainCommand mainCommand = new MainCommand();
+        pvpCommand.setExecutor(mainCommand);
+        pvpCommand.setTabCompleter(mainCommand);
+
+        try {
+            WorldGuardHook.init();
+        } catch (NoClassDefFoundError ignored) {}
+
+        Metrics metrics = new Metrics(this, 10597);
     }
 
     public void reloadPluginConfig() {
-        saveDefaultConfig();
-        reloadConfig();
         configCache = new ConfigCache();
     }
 
     public void reloadPluginConfig(CommandSender commandSender) {
         getServer().getScheduler().runTaskAsynchronously(this, () -> {
             reloadPluginConfig();
-            commandSender.sendMessage("TogglePvP configuration reloaded.");
+            commandSender.sendMessage("PreventStabby configuration reloaded.");
         });
     }
 
@@ -80,4 +97,7 @@ public final class TogglePvp extends JavaPlugin {
 
     public DatabaseSQLite getSqLite() {return sqLite;}
 
+    public SmartCache getSmartCache() {
+        return smartCache;
+    }
 }

src/main/java/me/youhavetrouble/preventstabby/api/PreventStabbyAPI.java

@@ -0,0 +1,123 @@
+package me.youhavetrouble.preventstabby.api;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import org.bukkit.entity.Player;
+import java.util.UUID;
+
+public class PreventStabbyAPI {
+
+    /**
+     * Sets players PvP state. This will always save to database.
+     * @param player Player to set pvp state to
+     * @param newState State to set
+     */
+    public static void setPvpEnabled(Player player, boolean newState) {
+        PreventStabby.getPlugin().getSmartCache().setPlayerPvpState(player.getUniqueId(), newState);
+    }
+
+    /**
+     * Sets players PvP state. This will always save to database.
+     * @param uuid UUID of player to set pvp state to
+     * @param newState State to set
+     */
+    public static void setPvpEnabled(UUID uuid, boolean newState) {
+        PreventStabby.getPlugin().getSmartCache().setPlayerPvpState(uuid, newState);
+    }
+
+    /**
+     * Gets player's PvP state. If player is not cached this will query the database.
+     * @param uuid UUID of the player to get data from.
+     * @return True if enabled, false if disabled
+     */
+    public static boolean getPvpEnabled(UUID uuid) {
+        return PreventStabby.getPlugin().getSmartCache().getPlayerData(uuid).isPvpEnabled();
+    }
+
+    /**
+     * Gets player's PvP state. If player is not cached this will query the database.
+     * @param player Player to get data from.
+     * @return True if enabled, false if disabled
+     */
+    public static boolean getPvpEnabled(Player player) {
+        return PreventStabby.getPlugin().getSmartCache().getPlayerData(player.getUniqueId()).isPvpEnabled();
+    }
+
+    /**
+     * Checks if player can be damaged by another. Providing UUID of entity other than player may result in exceptions
+     * @param attackerUuid Attacker's UUID
+     * @param victimUuid Victim's UUID
+     * @param sendDenyMessage True if check should send deny message to attacker
+     * @return True if victim can be attacked by attacker, false if not
+     */
+    public static boolean canDamage(UUID attackerUuid, UUID victimUuid, boolean sendDenyMessage) {
+        return  PreventStabby.getPlugin().getPlayerManager().canDamage(attackerUuid, victimUuid, sendDenyMessage);
+    }
+
+    /**
+     * Checks if player can be damaged by another.
+     * @param attacker Attacker
+     * @param victim Victim
+     * @param sendDenyMessage True if check should send deny message to attacker
+     * @return True if victim can be attacked by attacker, false if not
+     */
+    public static boolean canDamage(Player attacker, Player victim, boolean sendDenyMessage) {
+        return PreventStabby.getPlugin().getPlayerManager().canDamage(attacker.getUniqueId(), victim.getUniqueId(), sendDenyMessage);
+    }
+
+    /**
+     * Checks if player has login protection.
+     * @param uuid UUID of player to check
+     * @return True if player has login protection, false if not
+     */
+    public static boolean hasLoginProtection(UUID uuid) {
+        return PreventStabby.getPlugin().getPlayerManager().hasLoginProtection(uuid);
+    }
+
+    /**
+     * Checks if player has teleport protection.
+     * @param player Player to check
+     * @return True if player has teleport protection, false if not
+     */
+    public static boolean hasTeleportProtection(Player player) {
+        return PreventStabby.getPlugin().getPlayerManager().hasLoginProtection(player.getUniqueId());
+    }
+
+    /**
+     * Checks if player has teleport protection.
+     * @param uuid UUID of player to check
+     * @return True if player has teleport protection, false if not
+     */
+    public static boolean hasTeleportProtection(UUID uuid) {
+        return PreventStabby.getPlugin().getPlayerManager().hasLoginProtection(uuid);
+    }
+
+    /**
+     * Checks if player has login protection.
+     * @param player Player to check
+     * @return True if player has login protection, false if not
+     */
+    public static boolean hasLoginProtection(Player player) {
+        return PreventStabby.getPlugin().getPlayerManager().hasLoginProtection(player.getUniqueId());
+    }
+
+    /**
+     * Checks if player is in combat.
+     * @param uuid UUID of player to check
+     * @return True if player is in combat, false if they are not or if they are offline
+     */
+    public static boolean isInCombat(UUID uuid) {
+        return CombatTimer.isInCombat(uuid);
+    }
+
+    /**
+     * Checks if player is in combat.
+     * @param player Player to check
+     * @return True if player is in combat, false if they are not or if they are offline
+     */
+    public static boolean isInCombat(Player player) {
+        return CombatTimer.isInCombat(player.getUniqueId());
+    }
+
+
+}

src/main/java/me/youhavetrouble/preventstabby/api/event/PlayerEnterCombatEvent.java

@@ -0,0 +1,48 @@
+package me.youhavetrouble.preventstabby.api.event;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.players.PlayerData;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Fired when player enters combat.
+ */
+public class PlayerEnterCombatEvent extends Event implements Cancellable {
+
+    private static final HandlerList HANDLERS = new HandlerList();
+    private final Player player;
+    private boolean cancelled;
+
+    public PlayerEnterCombatEvent(Player player) {
+        this.player = player;
+        this.cancelled = false;
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public PlayerData getPlayerData() {
+        return PreventStabby.getPlugin().getPlayerManager().getPlayer(player.getUniqueId());
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        cancelled = cancel;
+    }
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+}

src/main/java/me/youhavetrouble/preventstabby/api/event/PlayerLeaveCombatEvent.java

@@ -0,0 +1,48 @@
+package me.youhavetrouble.preventstabby.api.event;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.players.PlayerData;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Fired when player leaves combat. If cancelled, it will refresh combat timer to the value set in the config.
+ */
+public class PlayerLeaveCombatEvent extends Event implements Cancellable {
+
+    private static final HandlerList HANDLERS = new HandlerList();
+    private final Player player;
+    private boolean cancelled;
+
+    public PlayerLeaveCombatEvent(Player player) {
+        this.player = player;
+        this.cancelled = false;
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public PlayerData getPlayerData() {
+        return PreventStabby.getPlugin().getPlayerManager().getPlayer(player.getUniqueId());
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        cancelled = cancel;
+    }
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+}

src/main/java/me/youhavetrouble/preventstabby/api/event/PlayerTogglePvpEvent.java

@@ -0,0 +1,49 @@
+package me.youhavetrouble.preventstabby.api.event;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * NOT IMPLEMENTED YET
+ */
+@Deprecated
+public class PlayerTogglePvpEvent extends Event {
+
+    private static final HandlerList HANDLERS = new HandlerList();
+    private final Player player;
+    private boolean newState, sendMessage;
+
+    public PlayerTogglePvpEvent(Player player, boolean newState, boolean sendMessage) {
+        this.player = player;
+        this.newState = newState;
+        this.sendMessage = sendMessage;
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public boolean newState() {
+        return newState;
+    }
+
+    public void setNewState(boolean newState) {
+        this.newState = newState;
+    }
+
+    public boolean isSendMessage() {
+        return sendMessage;
+    }
+
+    public void setSendMessage(boolean sendMessage) {
+        this.sendMessage = sendMessage;
+    }
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+}

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

@@ -1,23 +1,22 @@
-package eu.endermite.togglepvp.commands;
+package me.youhavetrouble.preventstabby.commands;
 
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.util.PluginMessages;
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.PluginMessages;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
-
 import java.util.ArrayList;
 import java.util.List;
 
 public class HelpCommand {
 
     public static void help(CommandSender sender, String[] args) {
-        Bukkit.getScheduler().runTaskAsynchronously(TogglePvp.getPlugin(), () -> {
+        Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> {
 
             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("togglepvp.command.toggle")) {
+            if (sender.hasPermission("preventstabby.command.toggle")) {
                 helpPage.add(PluginMessages.parseMessage("&9/pvp &b&l[on/off] &f- enables or disables PvP"));
                 helpPage.add(PluginMessages.parseMessage("&9/pvp &b&ltoggle &f- toggles PvP status"));
             }

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

@@ -0,0 +1,92 @@
+package me.youhavetrouble.preventstabby.commands;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.PluginMessages;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class MainCommand implements TabExecutor {
+
+    private final HashMap<String, String> subCommands = new HashMap<>();
+
+    public MainCommand() {
+        subCommands.put("help", "preventstabby.command");
+        subCommands.put("toggle", "preventstabby.command.toggle");
+        subCommands.put("on", "preventstabby.command.toggle");
+        subCommands.put("enable", "preventstabby.command.toggle");
+        subCommands.put("off", "preventstabby.command.toggle");
+        subCommands.put("disable", "preventstabby.command.toggle");
+        subCommands.put("reload", "preventstabby.command.reload");
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (sender.hasPermission("preventstabby.command")) {
+            if (args.length >= 1) {
+                switch (args[0].toLowerCase()) {
+                    case "help":
+                        HelpCommand.help(sender, args);
+                        break;
+                    case "toggle":
+                        PvpToggleCommand.toggle(sender, args);
+                        break;
+                    case "on":
+                    case "enable":
+                        PvpToggleCommand.enable(sender, args);
+                        break;
+                    case "off":
+                    case "disable":
+                        PvpToggleCommand.disable(sender, args);
+                        break;
+                    case "reload":
+                        ReloadCommand.reload(sender);
+                        break;
+                    default:
+                        sender.sendMessage(PluginMessages.parseMessage(PreventStabby.getPlugin().getConfigCache().getNo_such_command()));
+                        break;
+                }
+            } else {
+                HelpCommand.help(sender, args);
+            }
+        } else {
+            sender.sendMessage(PluginMessages.parseMessage(PreventStabby.getPlugin().getConfigCache().getNo_permission()));
+        }
+        return true;
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        List<String> commands = new ArrayList<>();
+        if (args.length == 1) {
+            String arg1 = args[0].toLowerCase();
+            for (Map.Entry<String, String> entry : subCommands.entrySet()) {
+                if (entry.getKey().toLowerCase().startsWith(arg1) && sender.hasPermission(entry.getValue()))
+                    commands.add(entry.getKey());
+            }
+            return commands;
+        } else if (args.length == 2 && sender.hasPermission("preventstabby.command.toggle")) {
+            switch (args[0].toLowerCase()) {
+                default:
+                    break;
+                case "toggle":
+                case "on":
+                case "enable":
+                case "off":
+                case "disable":
+                    for (Player player : Bukkit.getOnlinePlayers()) {
+                        commands.add(player.getName());
+                    }
+                    break;
+            }
+            return commands;
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,180 @@
+package me.youhavetrouble.preventstabby.commands;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PluginMessages;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PvpToggleCommand {
+
+    public static void toggle(CommandSender sender, String[] args) {
+
+        Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> {
+
+            if (!sender.hasPermission("preventstabby.command.toggle")) {
+                String message = ChatColor.translateAlternateColorCodes('&', PreventStabby.getPlugin().getConfigCache().getNo_permission());
+                sender.sendMessage(message);
+                return;
+            }
+
+            if (args.length == 1) {
+                if (sender instanceof Player) {
+                    Player player = (Player) sender;
+
+                    if (CombatTimer.isInCombat(player.getUniqueId())) {
+                        sender.sendMessage(PluginMessages.parseMessage(PreventStabby.getPlugin().getConfigCache().getCant_do_that_during_combat()));
+                        return;
+                    }
+
+                    boolean currentState = PreventStabby.getPlugin().getPlayerManager().togglePlayerPvpState(player.getUniqueId());
+
+                    String message = "";
+                    if (currentState) {
+                        message = PluginMessages.parseMessage(PreventStabby.getPlugin().getConfigCache().getPvp_enabled());
+                    } else {
+                        message = PluginMessages.parseMessage(PreventStabby.getPlugin().getConfigCache().getPvp_disabled());
+                    }
+                    player.sendMessage(message);
+                } else {
+                    sender.sendMessage("Try /pvp toggle <player>");
+                }
+            } else if (args.length == 2) {
+                if (!sender.hasPermission("preventstabby.command.toggle.others")) {
+                    String message = ChatColor.translateAlternateColorCodes('&', PreventStabby.getPlugin().getConfigCache().getNo_permission());
+                    sender.sendMessage(message);
+                    return;
+                }
+
+                if (sender instanceof Player) {
+                    Player player = (Player) sender;
+                    if (CombatTimer.isInCombat(player.getUniqueId())) {
+                        sender.sendMessage(PluginMessages.parseMessage(PreventStabby.getPlugin().getConfigCache().getCant_do_that_during_combat()));
+                        return;
+                    }
+                }
+                try {
+                    Player player = Bukkit.getPlayer(args[1]);
+                    boolean currentState = PreventStabby.getPlugin().getPlayerManager().togglePlayerPvpState(player.getUniqueId());
+                    String message;
+                    if (currentState) {
+                        message = PreventStabby.getPlugin().getConfigCache().getPvp_enabled_other();
+                    } else {
+                        message = PreventStabby.getPlugin().getConfigCache().getPvp_disabled_other();
+                    }
+                    sender.sendMessage(PluginMessages.parsePlayerName(player, message));
+
+                } catch (NullPointerException e) {
+                    sender.sendMessage(PluginMessages.parseMessage("&cPlayer offline."));
+                }
+            } else {
+                if (sender.hasPermission("preventstabby.command.toggle.others")) {
+                    sender.sendMessage("Try /pvp toggle <player>");
+                } else {
+                    sender.sendMessage("Try /pvp toggle");
+                }
+            }
+        });
+    }
+
+    public static void enable(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("preventstabby.command.toggle")) {
+            String message = ChatColor.translateAlternateColorCodes('&', PreventStabby.getPlugin().getConfigCache().getNo_permission());
+            sender.sendMessage(message);
+            return;
+        }
+        if (args.length == 1) {
+            if (sender instanceof Player) {
+                Player player = (Player) sender;
+                if (CombatTimer.isInCombat(player.getUniqueId())) {
+                    sender.sendMessage(PluginMessages.parseMessage(PreventStabby.getPlugin().getConfigCache().getCant_do_that_during_combat()));
+                    return;
+                }
+                PreventStabby.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), true);
+                String message = PluginMessages.parseMessage(PreventStabby.getPlugin().getConfigCache().getPvp_enabled());
+                player.sendMessage(message);
+            } else {
+                sender.sendMessage("Try /pvp enable <player>");
+            }
+        } else if (args.length == 2) {
+            if (!sender.hasPermission("preventstabby.command.toggle.others")) {
+                String message = ChatColor.translateAlternateColorCodes('&', PreventStabby.getPlugin().getConfigCache().getNo_permission());
+                sender.sendMessage(message);
+                return;
+            }
+            if (sender instanceof Player) {
+                Player player = (Player) sender;
+                if (CombatTimer.isInCombat(player.getUniqueId())) {
+                    sender.sendMessage(PluginMessages.parseMessage(PreventStabby.getPlugin().getConfigCache().getCant_do_that_during_combat()));
+                    return;
+                }
+            }
+            try {
+                Player player = Bukkit.getPlayer(args[1]);
+                String message = PreventStabby.getPlugin().getConfigCache().getPvp_enabled_other();
+                sender.sendMessage(PluginMessages.parsePlayerName(player, message));
+                PreventStabby.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), true);
+            } catch (NullPointerException e) {
+                sender.sendMessage(PluginMessages.parseMessage("&cPlayer offline."));
+            }
+        } else {
+            if (sender.hasPermission("preventstabby.command.toggle.others")) {
+                sender.sendMessage("Try /pvp enable <player>");
+            } else {
+                sender.sendMessage("Try /pvp enable");
+            }
+        }
+    }
+
+    public static void disable(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("preventstabby.command.toggle")) {
+            String message = ChatColor.translateAlternateColorCodes('&', PreventStabby.getPlugin().getConfigCache().getNo_permission());
+            sender.sendMessage(message);
+            return;
+        }
+        if (args.length == 1) {
+            if (sender instanceof Player) {
+                Player player = (Player) sender;
+                if (CombatTimer.isInCombat(player.getUniqueId())) {
+                    sender.sendMessage(PluginMessages.parseMessage(PreventStabby.getPlugin().getConfigCache().getCant_do_that_during_combat()));
+                    return;
+                }
+                PreventStabby.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), false);
+                String message = PluginMessages.parseMessage(PreventStabby.getPlugin().getConfigCache().getPvp_disabled());
+                player.sendMessage(message);
+            } else {
+                sender.sendMessage("Try /pvp disable <player>");
+            }
+        } else if (args.length == 2) {
+            if (!sender.hasPermission("preventstabby.command.toggle.others")) {
+                String message = PreventStabby.getPlugin().getConfigCache().getNo_permission();
+                sender.sendMessage(message);
+                return;
+            }
+            if (sender instanceof Player) {
+                Player player = (Player) sender;
+                if (CombatTimer.isInCombat(player.getUniqueId())) {
+                    sender.sendMessage(PluginMessages.parseMessage(PreventStabby.getPlugin().getConfigCache().getCant_do_that_during_combat()));
+                    return;
+                }
+            }
+            try {
+                Player player = Bukkit.getPlayer(args[1]);
+                String message = PreventStabby.getPlugin().getConfigCache().getPvp_disabled_other();
+                sender.sendMessage(PluginMessages.parsePlayerName(player, message));
+                PreventStabby.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), true);
+            } catch (NullPointerException e) {
+                sender.sendMessage(PluginMessages.parseMessage("&cPlayer offline."));
+            }
+        } else {
+            if (sender.hasPermission("preventstabby.command.toggle.others")) {
+                sender.sendMessage("Try /pvp disable <player>");
+            } else {
+                sender.sendMessage("Try /pvp disable");
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,23 @@
+package me.youhavetrouble.preventstabby.commands;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+public class ReloadCommand {
+
+    public static void reload(CommandSender sender) {
+
+        Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> {
+            if (!sender.hasPermission("preventstabby.command.reload")) {
+                String message = ChatColor.translateAlternateColorCodes('&', PreventStabby.getPlugin().getConfigCache().getNo_permission());
+                sender.sendMessage(message);
+                return;
+            }
+            PreventStabby.getPlugin().reloadPluginConfig(sender);
+        });
+
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/config/ConfigCache.java

@@ -0,0 +1,143 @@
+package me.youhavetrouble.preventstabby.config;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import io.github.thatsmusic99.configurationmaster.CMFile;
+import lombok.Getter;
+import org.bukkit.configuration.file.FileConfiguration;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class ConfigCache {
+
+    private final PreventStabby plugin = PreventStabby.getPlugin();
+
+    @Getter private final boolean pvp_enabled_by_default, lava_and_fire_stopper_enabled, channeling_enchant_disabled,
+            punish_for_combat_logout, punish_for_combat_logout_announce, only_owner_can_interact_with_pet,
+            snowballs_knockback, egg_knockback, block_commands_in_combat, block_teleports_in_combat;
+    @Getter private final String pvp_enabled, pvp_disabled, cannot_attack_victim, cannot_attack_attacker,
+            cannot_attack_pets_victim, cannot_attack_pets_attacker, no_permission, no_such_command, pvp_enabled_other,
+            pvp_disabled_other, punish_for_combat_logout_message, entering_combat, leaving_combat,
+            cant_do_that_during_combat, cannot_attack_mounts_attacker, cannot_attack_mounts_victim;
+    @Getter private final double lava_and_fire_stopper_radius;
+    @Getter private final long cache_time, combat_time, login_protection_time, teleport_protection_time;
+    @Getter private final Set<String> combatBlockedCommands = new HashSet<>();
+
+    public ConfigCache() {
+
+        CMFile configFile = new CMFile(plugin, "config") {
+            @Override
+            public void loadDefaults() {
+
+                addDefault("settings.pvp_enabled_by_default", false, "Decides if pvp should be enabled or disabled by default");
+
+                addComment("settings.lava_and_fire_stopper", "Prevents dumping lava and pufferfish bucket, placing wither roses and lighting blocks on fire near players with pvp off");
+                addDefault("settings.lava_and_fire_stopper.enabled", true);
+                addDefault("settings.lava_and_fire_stopper.radius", 2.5);
+
+                addDefault("settings.channeling_enchant_disabled", false, "Disables channeling (trident enchant) lightning strike.\nYou may want to keep it disabled because players with pvp off can use it to attack players with pvp on");
+
+                addDefault("settings.only_owner_can_interact_with_pet", false, "Makes it so only pet owner can interact with it. Useful if you don't want people renaming other people's pets.");
+
+                addDefault("settings.combat_time", 25, "Time (in seconds) to keep player in combat");
+
+                addDefault("settings.login_protection_time", 0, "Time (in seconds) that player can't be harmed by other player after logging in");
+
+                addDefault("settings.teleport_protection_time", 0, "Time (in seconds) that player can't be harmed by other player after teleporting");
+
+                addComment("settings.punish_for_combat_logout", "Kill the player if they log out during combat");
+                addDefault("settings.punish_for_combat_logout.enabled", true);
+                addDefault("settings.punish_for_combat_logout.announce", true);
+                addDefault("settings.punish_for_combat_logout.message", "&f%player% logged out while in combat. What a loser.");
+
+                addDefault("settings.snowballs_do_knockback", false, "Set to true if snowballs should cause knockback to players");
+
+                addDefault("settings.eggs_do_knockback", false, "Set to true if eggs should cause knockback to players");
+
+                addComment("settings.block_in_combat", "Set what actions should be blocked while in combat");
+                addDefault("settings.block_in_combat.block_commands.enabled", true);
+                List<String> defaultCommandsBlocked = new ArrayList<>();
+                defaultCommandsBlocked.add("spawn");
+                defaultCommandsBlocked.add("tpa");
+                defaultCommandsBlocked.add("home");
+                addDefault("settings.block_in_combat.block_commands.commands", defaultCommandsBlocked);
+                addDefault("settings.block_in_combat.block_teleports", true, "Set if players should be denied teleportation attempts while in combat");
+
+                addDefault("settings.cache_time", 30, "Time (in seconds) to keep player data in memory when players goes offline.\nThis is used for checking if offline players pvp state.\nAdjust only if you know what you're doing. NEVER set to less than 6.");
+
+                addDefault("messages.pvp_enabled", "&cYou enabled PvP!");
+                addDefault("messages.pvp_disabled", "&cYou disabled PvP!");
+                addDefault("messages.cannot_attack_victim", "&cYou can't attack players that have PvP turned off!");
+                addDefault("messages.cannot_attack_attacker", "&cYou can't attack players while you have PvP turned off!");
+                addDefault("messages.cannot_attack_pets_victim", "&cYou can't attack pets of players that have PvP turned off");
+                addDefault("messages.cannot_attack_pets_attacker", "&cYou can't attack pets while you have PvP turned off");
+                addDefault("messages.cannot_attack_mounts_victim", "&cYou can't attack mounts of players that have PvP turned off");
+                addDefault("messages.cannot_attack_mounts_attacker", "&cYou can't attack mounts while you have PvP turned off");
+                addDefault("messages.no_permission", "&cYou don't have permission to use that.");
+                addDefault("messages.no_such_command", "&cNo such command.");
+                addDefault("messages.pvp_enabled_others", "&cYou've enabled %player%'s PvP.");
+                addDefault("messages.pvp_disabled_others", "&cYou've disabled %player%'s PvP.");
+                addDefault("messages.entering_combat", "&cEntering combat");
+                addDefault("messages.leaving_combat", "&cLeaving combat");
+                addDefault("messages.cant_do_that_during_combat", "&cYou can't do that while in combat!");
+            }
+        };
+
+        configFile.setDescription("PvP toggle that CARES about your pets!");
+        configFile.addLink("Spigot", "https://www.spigotmc.org/resources/togglepvp.89376/");
+        configFile.addLink("Source", "https://github.com/YouHaveTrouble/TogglePvP");
+
+        configFile.load();
+        FileConfiguration config = configFile.getConfig();
+
+        // Settings
+        this.pvp_enabled_by_default = config.getBoolean("settings.pvp_enabled_by_default", false);
+
+        this.lava_and_fire_stopper_enabled = config.getBoolean("settings.lava_and_fire_stopper.enabled", true);
+        this.lava_and_fire_stopper_radius = config.getDouble("settings.lava_and_fire_stopper.radius", 2.5);
+
+        this.channeling_enchant_disabled = config.getBoolean("settings.channeling_enchant_disabled", true);
+
+        this.combat_time = config.getLong("settings.combat_time", 25L);
+        this.punish_for_combat_logout = config.getBoolean("settings.punish_for_combat_logout.enabled", true);
+        this.punish_for_combat_logout_announce = config.getBoolean("settings.punish_for_combat_logout.announce", true);
+        this.punish_for_combat_logout_message = config.getString("settings.punish_for_combat_logout.message", "&f%player% logged out while in combat. What a loser.");
+        this.only_owner_can_interact_with_pet = config.getBoolean("settings.only_owner_can_interact_with_pet", false);
+
+        this.snowballs_knockback = config.getBoolean("settings.snowballs_do_knockback", false);
+        this.egg_knockback = config.getBoolean("settings.eggs_do_knockback", false);
+        this.block_commands_in_combat = config.getBoolean("settings.block_in_combat.block_commands", true);
+        if (block_commands_in_combat) {
+            this.combatBlockedCommands.addAll(config.getStringList("settings.block_in_combat.block_commands.commands"));
+        }
+        this.block_teleports_in_combat = config.getBoolean("settings.block_in_combat.block_teleports", true);
+
+        this.cache_time = config.getLong("settings.cache_time", 30L);
+
+        this.login_protection_time = config.getLong("settings.login_protection_time", 0);
+        this.teleport_protection_time = config.getLong("settings.teleport_protection_time", 0);
+
+        // Messages
+        this.pvp_enabled = config.getString("messages.pvp_enabled", "&cYou enabled PvP!");
+        this.pvp_disabled = config.getString("messages.pvp_disabled", "&cYou disabled PvP!");
+        this.cannot_attack_victim = config.getString("messages.cannot_attack_victim", "&cYou can't attack players that have PvP turned off!");
+        this.cannot_attack_attacker = config.getString("messages.cannot_attack_attacker", "&cYou can't attack players while you have PvP turned off!");
+        this.cannot_attack_pets_victim = config.getString("messages.cannot_attack_pets_victim", "&cYou can't attack pets while you have PvP turned off");
+        this.cannot_attack_pets_attacker = config.getString("messages.cannot_attack_pets_attacker", "&cYou can't attack pets of players that have PvP turned off");
+        this.cannot_attack_mounts_victim = config.getString("messages.cannot_attack_mounts_victim", "&cYou can't attack mounts of players that have PvP turned off");
+        this.cannot_attack_mounts_attacker = config.getString("messages.cannot_attack_mounts_attacker", "&cYou can't attack mounts while you have PvP turned off");
+        this.no_permission = config.getString("messages.no_permission", "&cYou don't have permission to use that.");
+        this.no_such_command = config.getString("messages.no_such_command", "&cNo such command.");
+        this.pvp_enabled_other = config.getString("messages.pvp_enabled_others", "&cYou've enabled %player%'s PvP.");
+        this.pvp_disabled_other = config.getString("messages.pvp_disabled_others", "&cYou've disabled %player%'s PvP.");
+        this.entering_combat = config.getString("messages.entering_combat", "&cEntering combat");
+        this.leaving_combat = config.getString("messages.leaving_combat", "&cLeaving combat");
+        this.cant_do_that_during_combat = config.getString("messages.cant_do_that_during_combat", "&cYou can't do that while in combat!");
+
+
+    }
+
+
+}

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

@@ -0,0 +1,74 @@
+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 WorldGuardPlugin worldGuardPlugin;
+    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.inst();
+            if (WorldGuard.getInstance() == null || worldGuardPlugin == null) return;
+            plugin.getLogger().info("Hooking into WorldGuard");
+            flagRegistry = WorldGuard.getInstance().getFlagRegistry();
+            createForcePvpFlag(plugin);
+        } catch (NoClassDefFoundError | ClassNotFoundException e) {
+            return;
+        }
+    }
+
+    private static void createForcePvpFlag(Plugin plugin) {
+        if (!isHooked()) return;
+        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) {
+        if (!isHooked()) return false;
+        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);
+    }
+
+    public static boolean isHooked() {
+        return worldGuardPlugin != null;
+    }
+
+
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/mount/MountHitByExplosionListener.java

@@ -0,0 +1,27 @@
+package me.youhavetrouble.preventstabby.listeners.mount;
+
+import me.youhavetrouble.preventstabby.util.Util;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageEvent;
+
+import java.util.UUID;
+
+@PreventStabbyListener
+public class MountHitByExplosionListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerAttackMount(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+        if (!(event.getDamager() instanceof Player) || event.getEntity().getPassengers().isEmpty()) return;
+        if (!event.getCause().equals(EntityDamageEvent.DamageCause.ENTITY_EXPLOSION)) return;
+        UUID damager = event.getDamager().getUniqueId();
+        Entity mount = event.getEntity();
+        if (Util.processMountAttack(damager, mount))
+            event.setCancelled(true);
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/mount/MountHitByFireworkListener.java

@@ -0,0 +1,30 @@
+package me.youhavetrouble.preventstabby.listeners.mount;
+
+import me.youhavetrouble.preventstabby.util.Util;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Firework;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageEvent;
+
+import java.util.UUID;
+
+@PreventStabbyListener
+public class MountHitByFireworkListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerAttackMount(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+        if (!(event.getDamager() instanceof Firework) || event.getEntity().getPassengers().isEmpty()) return;
+        if (!event.getCause().equals(EntityDamageEvent.DamageCause.ENTITY_EXPLOSION)) return;
+        Firework firework = (Firework) event.getDamager();
+        if (!(firework.getShooter() instanceof Player)) return;
+        UUID damager = ((Player) firework.getShooter()).getUniqueId();
+        Entity mount = event.getEntity();
+        if (Util.processMountAttack(damager, mount))
+            event.setCancelled(true);
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/mount/MountHitBySplashPotionListener.java

@@ -0,0 +1,40 @@
+package me.youhavetrouble.preventstabby.listeners.mount;
+
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import me.youhavetrouble.preventstabby.util.Util;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.potion.PotionEffect;
+
+import java.util.UUID;
+
+@PreventStabbyListener
+public class MountHitBySplashPotionListener implements Listener {
+
+    /**
+     * If thrown potion applies negative effects and it's thrown by a player
+     * it will have no effect on a pet of a player with pvp off
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onMountHitBySplashPotion(org.bukkit.event.entity.PotionSplashEvent event) {
+        if (!(event.getEntity().getShooter() instanceof Player)) return;
+        boolean harmful = false;
+        for (PotionEffect effect : event.getPotion().getEffects()) {
+            if (Util.isPotionEffectHarmful(effect.getType())) {
+                harmful = true;
+                break;
+            }
+        }
+        if (!harmful) return;
+        UUID damager = ((Player) event.getEntity().getShooter()).getUniqueId();
+        for (LivingEntity entity : event.getAffectedEntities()) {
+            if (entity.getPassengers().isEmpty()) continue;
+            if (Util.processMountAttack(damager, entity))
+                event.setIntensity(entity, 0);
+        }
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/mount/PlayerAttackMountListener.java

@@ -0,0 +1,25 @@
+package me.youhavetrouble.preventstabby.listeners.mount;
+
+import me.youhavetrouble.preventstabby.util.Util;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PlayerAttackMountListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerAttackMount(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+        if (!(event.getDamager() instanceof Player) || event.getEntity().getPassengers().isEmpty()) return;
+        Entity entity = event.getEntity();
+        UUID damager = event.getDamager().getUniqueId();
+        if (Util.processMountAttack(damager, entity))
+            event.setCancelled(true);
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/mount/PlayerHitMountWithProjectileListener.java

@@ -0,0 +1,28 @@
+package me.youhavetrouble.preventstabby.listeners.mount;
+
+import me.youhavetrouble.preventstabby.util.Util;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PlayerHitMountWithProjectileListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerAttackMount(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+        if (!(event.getDamager() instanceof Player) || event.getEntity().getPassengers().isEmpty()) return;
+        Projectile projectile = (Projectile) event.getDamager();
+        if (!(projectile.getShooter() instanceof Player)) return;
+        Entity entity = event.getEntity();
+        UUID damager = event.getDamager().getUniqueId();
+        if (Util.processMountAttack(damager, entity))
+            event.setCancelled(true);
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PetHitByExplosionListener.java

@@ -0,0 +1,40 @@
+package me.youhavetrouble.preventstabby.listeners.pets;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageEvent;
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PetHitByExplosionListener implements Listener {
+
+    /**
+     * Cancels explosion damage for pets with pvp off that is caused by players
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPetHitByExplosion(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+        if (!(event.getEntity() instanceof Tameable)) return;
+        if (!event.getCause().equals(EntityDamageEvent.DamageCause.ENTITY_EXPLOSION)) return;
+        Tameable tameable = (Tameable) event.getEntity();
+        if (tameable.getOwner() == null) return;
+
+        UUID victim = tameable.getOwner().getUniqueId();
+
+        try {
+            UUID damager = UUID.fromString(event.getDamager().getMetadata("PLAYEREXPLODED").get(0).asString());
+            if (victim.equals(damager))
+                return;
+
+            if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
+                event.setCancelled(true);
+        } catch (NullPointerException | IndexOutOfBoundsException ignored) {}
+
+    }
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PetHitByFireworkListener.java

@@ -0,0 +1,35 @@
+package me.youhavetrouble.preventstabby.listeners.pets;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Firework;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PetHitByFireworkListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPetFireworkDamage(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+        if (event.getDamager() instanceof Firework && event.getEntity() instanceof Tameable) {
+            Tameable tameable = (Tameable) event.getEntity();
+            if (tameable.getOwner() == null) return;
+            Firework firework = (Firework) event.getDamager();
+            if (!(firework.getShooter() instanceof Player)) return;
+            UUID damager = ((Player) firework.getShooter()).getUniqueId();
+            UUID victim = tameable.getOwner().getUniqueId();
+            if (victim.equals(damager)) return;
+
+            if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
+                event.setCancelled(true);
+
+        }
+    }
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PetHitBySplashPotionListener.java

@@ -0,0 +1,53 @@
+package me.youhavetrouble.preventstabby.listeners.pets;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import me.youhavetrouble.preventstabby.util.Util;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PetHitBySplashPotionListener implements Listener {
+
+    /**
+     * If thrown potion applies negative effects and it's thrown by a player
+     * it will have no effect on a pet of a player with pvp off
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPetHitBySplashPotion(org.bukkit.event.entity.PotionSplashEvent event) {
+
+        if (!(event.getEntity().getShooter() instanceof Player)) return;
+        boolean harmful = false;
+
+        for (PotionEffect effect : event.getPotion().getEffects()) {
+            if (Util.isPotionEffectHarmful(effect.getType())) {
+                harmful = true;
+                break;
+            }
+        }
+        if (!harmful) return;
+        UUID damager = ((Player) event.getEntity().getShooter()).getUniqueId();
+        for (Entity entity : event.getAffectedEntities()) {
+            if (entity instanceof Tameable) {
+                Tameable tameable = (Tameable) entity;
+                if (tameable.getOwner() == null) continue;
+                UUID victim = tameable.getOwner().getUniqueId();
+                if (victim == damager) return;
+
+                if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
+                else
+                    event.setCancelled(true);
+            }
+        }
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PetLeashListener.java

@@ -0,0 +1,32 @@
+package me.youhavetrouble.preventstabby.listeners.pets;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PetLeashListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPetLeash(org.bukkit.event.entity.PlayerLeashEntityEvent event) {
+        if (event.getEntity() instanceof Tameable) {
+            Tameable tameable = (Tameable) event.getEntity();
+            if (tameable.getOwner() == null) return;
+
+            UUID damager = event.getPlayer().getUniqueId();
+            UUID victim = tameable.getOwner().getUniqueId();
+            if (victim == damager) return;
+
+            if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
+                event.setCancelled(true);
+        }
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PetTargettingMountListener.java

@@ -0,0 +1,38 @@
+package me.youhavetrouble.preventstabby.listeners.pets;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.players.SmartCache;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import me.youhavetrouble.preventstabby.util.Util;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.Wolf;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+@PreventStabbyListener
+public class PetTargettingMountListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onWolfAttackMount(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+        if (!(event.getDamager() instanceof Tameable) || event.getEntity().getPassengers().isEmpty()) return;
+        Tameable damager = (Tameable) event.getDamager();
+        Entity victim = event.getEntity();
+        if (damager.getOwner() == null) return;
+
+        SmartCache smartCache = PreventStabby.getPlugin().getSmartCache();
+        boolean damagerPvpEnabled = smartCache.getPlayerData(damager.getOwner().getUniqueId()).isPvpEnabled();
+        boolean victimPvpEnabled = !Util.processMountAttack(damager.getOwner().getUniqueId(), victim);
+
+        if (!victimPvpEnabled || !damagerPvpEnabled) {
+            if (damager instanceof Wolf) {
+                Wolf wolf = (Wolf) damager;
+                wolf.setAngry(false);
+            }
+            event.setCancelled(true);
+        }
+
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PetTargettingPetListener.java

@@ -0,0 +1,36 @@
+package me.youhavetrouble.preventstabby.listeners.pets;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.players.SmartCache;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.Wolf;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+@PreventStabbyListener
+public class PetTargettingPetListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onWolfAttackWolf(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+        if (event.getDamager() instanceof Tameable && event.getEntity() instanceof Tameable) {
+            Tameable damager = (Tameable) event.getDamager();
+            Tameable victim = (Tameable) event.getEntity();
+            if (damager.getOwner() == null || victim.getOwner() == null) return;
+
+            SmartCache smartCache = PreventStabby.getPlugin().getSmartCache();
+            boolean damagerPvpEnabled = smartCache.getPlayerData(damager.getOwner().getUniqueId()).isPvpEnabled();
+            boolean victimPvpEnabled = smartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
+
+            if (!victimPvpEnabled || !damagerPvpEnabled) {
+                if (damager instanceof Wolf) {
+                    Wolf wolf = (Wolf) damager;
+                    wolf.setAngry(false);
+                }
+                event.setCancelled(true);
+            }
+        }
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PetTargettingPlayerListener.java

@@ -0,0 +1,35 @@
+package me.youhavetrouble.preventstabby.listeners.pets;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PetTargettingPlayerListener implements Listener {
+    /**
+     * Stops pets with owners targetting players with pvp off
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPetTargetPlayer(org.bukkit.event.entity.EntityTargetEvent event) {
+        if (!(event.getEntity() instanceof Tameable)) return;
+        Tameable entity = (Tameable) event.getEntity();
+        if (entity.getOwner() == null) return;
+
+        if (event.getTarget() instanceof Player) {
+            UUID damager = entity.getOwner().getUniqueId();
+            UUID victim = event.getTarget().getUniqueId();
+
+            if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
+                event.setCancelled(true);
+        }
+    }
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PlayerAttackPetListener.java

@@ -0,0 +1,49 @@
+package me.youhavetrouble.preventstabby.listeners.pets;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.config.ConfigCache;
+import me.youhavetrouble.preventstabby.players.SmartCache;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PluginMessages;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PlayerAttackPetListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerAttackPet(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+
+        if (event.getDamager() instanceof Player && event.getEntity() instanceof Tameable) {
+            SmartCache smartCache = PreventStabby.getPlugin().getSmartCache();
+            Tameable tameable = (Tameable) event.getEntity();
+            if (tameable.getOwner() == null) return;
+
+            UUID damager = event.getDamager().getUniqueId();
+            UUID victim = tameable.getOwner().getUniqueId();
+
+            if (damager.equals(victim)) return;
+
+            ConfigCache config = PreventStabby.getPlugin().getConfigCache();
+            boolean damagerPvpState = PreventStabby.getPlugin().getPlayerManager().getPlayerPvPState(damager);
+            if (!damagerPvpState) {
+                PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
+                event.setCancelled(true);
+                return;
+            }
+            if (!smartCache.getPlayerData(victim).isPvpEnabled()) {
+                PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
+                event.setCancelled(true);
+                return;
+            }
+            CombatTimer.refreshPlayersCombatTime(damager);
+
+        }
+    }
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PlayerHitPetWithProjectileListener.java

@@ -0,0 +1,54 @@
+package me.youhavetrouble.preventstabby.listeners.pets;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.config.ConfigCache;
+import me.youhavetrouble.preventstabby.players.SmartCache;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PluginMessages;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PlayerHitPetWithProjectileListener implements Listener {
+
+     /**
+     * Cancels damage done by projectiles to pets of players with pvp off
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerHitPetWithProjectile(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+        if (event.getEntity() instanceof Tameable && event.getDamager() instanceof Projectile) {
+            Projectile projectile = (Projectile) event.getDamager();
+            if (!(projectile.getShooter() instanceof Player)) return;
+            Tameable tameable = (Tameable) event.getEntity();
+            if (tameable.getOwner() == null) return;
+
+            UUID damager = ((Player) projectile.getShooter()).getUniqueId();
+            UUID victim = tameable.getOwner().getUniqueId();
+
+            if (damager.equals(victim)) return;
+
+            ConfigCache config = PreventStabby.getPlugin().getConfigCache();
+            SmartCache smartCache = PreventStabby.getPlugin().getSmartCache();
+
+            if (!smartCache.getPlayerData(damager).isPvpEnabled()) {
+                PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
+                event.setCancelled(true);
+                return;
+            }
+            if (!smartCache.getPlayerData(victim).isPvpEnabled()) {
+                PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
+                event.setCancelled(true);
+                return;
+            }
+            CombatTimer.refreshPlayersCombatTime(damager);
+
+        }
+    }
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PlayerInteractWithPetListener.java

@@ -0,0 +1,26 @@
+package me.youhavetrouble.preventstabby.listeners.pets;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+@PreventStabbyListener
+public class PlayerInteractWithPetListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerInteractWithPet(org.bukkit.event.player.PlayerInteractEntityEvent event) {
+
+        if (!PreventStabby.getPlugin().getConfigCache().isOnly_owner_can_interact_with_pet()) return;
+        if (!(event.getRightClicked() instanceof Tameable)) return;
+
+        Tameable tameable = (Tameable) event.getRightClicked();
+        if (tameable.getOwner() == null) return;
+        if (tameable.getOwner().getUniqueId().equals(event.getPlayer().getUniqueId())) return;
+
+        event.setCancelled(true);
+
+    }
+}

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

@@ -0,0 +1,47 @@
+package me.youhavetrouble.preventstabby.listeners.player;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.players.PlayerManager;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.Wolf;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PetAttackPlayerListener implements Listener {
+
+    /**
+     * Pets stop following player with pvp off after trying to hit them
+     * This is to fix any inconsistancy with pet behavior
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPetAttack(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+
+        if (!(event.getDamager() instanceof Tameable)) return;
+
+        Tameable entity = (Tameable) event.getDamager();
+        if (entity.getOwner() != null && event.getEntity() instanceof Player) {
+
+            UUID victim = event.getEntity().getUniqueId();
+            UUID damager = entity.getOwner().getUniqueId();
+            PlayerManager playerManager = PreventStabby.getPlugin().getPlayerManager();
+
+            if (!playerManager.canDamage(damager, victim, false)) {
+                if (entity instanceof Wolf) {
+                    Wolf wolf = (Wolf) entity;
+                    wolf.setAngry(false);
+                }
+                event.setCancelled(true);
+                return;
+            }
+            CombatTimer.refreshPlayersCombatTime(damager, victim);
+        }
+
+    }
+
+}

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

@@ -0,0 +1,35 @@
+package me.youhavetrouble.preventstabby.listeners.player;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PlayerAttackListener implements Listener {
+
+    /**
+     * Cancels basic attacks done to player with pvp off
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerAttack(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+        Entity damagerEntity = event.getDamager();
+        Entity victimEntity = event.getEntity();
+
+        if (damagerEntity instanceof Player && victimEntity instanceof Player) {
+            UUID damager = damagerEntity.getUniqueId();
+            UUID victim = victimEntity.getUniqueId();
+
+            if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
+                event.setCancelled(true);
+        }
+    }
+
+}

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

@@ -0,0 +1,27 @@
+package me.youhavetrouble.preventstabby.listeners.player;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.players.PlayerData;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+@PreventStabbyListener
+public class PlayerDeathListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPlayerDeath(org.bukkit.event.entity.EntityDeathEvent event) {
+
+        if (!(event.getEntity() instanceof Player)) return;
+
+        Player player = (Player) event.getEntity();
+
+        PlayerData playerData = PreventStabby.getPlugin().getSmartCache().getPlayerData(player.getUniqueId());
+        playerData.setCombattime(0);
+        playerData.setLastCombatCheck(false);
+        playerData.setInCombat(false);
+    }
+
+}

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

@@ -1,11 +1,13 @@
-package eu.endermite.togglepvp.listeners.player;
+package me.youhavetrouble.preventstabby.listeners.player;
 
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
-import eu.endermite.togglepvp.players.SmartCache;
-import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.util.PluginMessages;
-import org.bukkit.entity.*;
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.EnderCrystal;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -14,7 +16,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.metadata.FixedMetadataValue;
 import java.util.UUID;
 
-@eu.endermite.togglepvp.util.Listener
+@PreventStabbyListener
 public class PlayerHitByExplosionListener implements Listener {
 
     /**
@@ -23,29 +25,19 @@ public class PlayerHitByExplosionListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerHitByExplosion(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
         if (event.getEntity() instanceof Player) {
-            if (!event.getCause().equals(EntityDamageEvent.DamageCause.ENTITY_EXPLOSION)) {
-                return;
-            }
-            Player victim = (Player) event.getEntity();
+            if (!event.getCause().equals(EntityDamageEvent.DamageCause.ENTITY_EXPLOSION)) return;
+
+            UUID victim = event.getEntity().getUniqueId();
             try {
-                UUID damageruuid = UUID.fromString(event.getDamager().getMetadata("PLAYEREXPLODED").get(0).asString());
-                if (!victim.getUniqueId().equals(damageruuid)) {
-                    ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-                    boolean damagerPvpEnabled = SmartCache.getPlayerData(damageruuid).isPvpEnabled();
-                    if (!damagerPvpEnabled) {
-                        PluginMessages.sendActionBar(damageruuid, config.getCannot_attack_attacker());
+                UUID damager = UUID.fromString(event.getDamager().getMetadata("PLAYEREXPLODED").get(0).asString());
+                if (victim.equals(damager)) return;
+
+                if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true))
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
+                else
                     event.setCancelled(true);
-                        return;
-                    }
-                    boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                    if (!victimPvpEnabled) {
-                        PluginMessages.sendActionBar(damageruuid, config.getCannot_attack_victim());
-                        event.setCancelled(true);
-                        return;
-                    }
-                    CombatTimer.refreshPlayersCombatTime(damageruuid, victim.getUniqueId());
-                }
-            } catch (NullPointerException | IndexOutOfBoundsException ignored) {}
+
+            } catch (NullPointerException | IndexOutOfBoundsException ignored) { }
         }
     }
 
@@ -58,12 +50,12 @@ public class PlayerHitByExplosionListener implements Listener {
         if (event.getEntity() instanceof EnderCrystal) {
             EnderCrystal enderCrystal = (EnderCrystal) event.getEntity();
             if (event.getDamager() instanceof Player) {
-                enderCrystal.setMetadata("PLAYEREXPLODED", new FixedMetadataValue(TogglePvp.getPlugin(), event.getDamager().getUniqueId().toString()));
+                enderCrystal.setMetadata("PLAYEREXPLODED", new FixedMetadataValue(PreventStabby.getPlugin(), event.getDamager().getUniqueId().toString()));
             } else if (event.getDamager() instanceof Projectile) {
                 Projectile projectile = (Projectile) event.getDamager();
                 if (projectile.getShooter() instanceof Player) {
                     Player damager = (Player) projectile.getShooter();
-                    enderCrystal.setMetadata("PLAYEREXPLODED", new FixedMetadataValue(TogglePvp.getPlugin(), damager.getUniqueId().toString()));
+                    enderCrystal.setMetadata("PLAYEREXPLODED", new FixedMetadataValue(PreventStabby.getPlugin(), damager.getUniqueId().toString()));
                 }
             }
         }
@@ -78,13 +70,14 @@ public class PlayerHitByExplosionListener implements Listener {
             TNTPrimed tntPrimed = (TNTPrimed) event.getEntity();
             if (tntPrimed.getSource() instanceof Player) {
                 Player damager = (Player) tntPrimed.getSource();
-                tntPrimed.setMetadata("PLAYEREXPLODED",new FixedMetadataValue( TogglePvp.getPlugin(), damager.getUniqueId().toString()));
+                tntPrimed.setMetadata("PLAYEREXPLODED", new FixedMetadataValue(PreventStabby.getPlugin(), damager.getUniqueId().toString()));
             } else if (tntPrimed.getSource() instanceof TNTPrimed) {
                 try {
                     TNTPrimed sourceTnt = (TNTPrimed) tntPrimed.getSource();
                     String damagerUuid = sourceTnt.getMetadata("PLAYEREXPLODED").get(0).asString();
-                    tntPrimed.setMetadata("PLAYEREXPLODED", new FixedMetadataValue( TogglePvp.getPlugin(), damagerUuid));
-                }catch (NullPointerException ignored) {}
+                    tntPrimed.setMetadata("PLAYEREXPLODED", new FixedMetadataValue(PreventStabby.getPlugin(), damagerUuid));
+                } catch (NullPointerException ignored) {
+                }
             }
         }
     }
@@ -97,7 +90,7 @@ public class PlayerHitByExplosionListener implements Listener {
     public void onPlayerPlacedTntMinecart(org.bukkit.event.entity.EntityPlaceEvent event) {
         if (event.getEntityType().equals(EntityType.MINECART_TNT)) {
             if (event.getPlayer() != null) {
-                event.getEntity().setMetadata("PLAYEREXPLODED", new FixedMetadataValue( TogglePvp.getPlugin(), event.getPlayer().getUniqueId().toString()));
+                event.getEntity().setMetadata("PLAYEREXPLODED", new FixedMetadataValue(PreventStabby.getPlugin(), event.getPlayer().getUniqueId().toString()));
             }
         }
     }
@@ -109,7 +102,7 @@ public class PlayerHitByExplosionListener implements Listener {
     public void onPlayerNudgedTntMinecart(org.bukkit.event.vehicle.VehicleEntityCollisionEvent event) {
         if (event.getVehicle() instanceof ExplosiveMinecart && event.getEntity() instanceof Player) {
             Player damager = (Player) event.getEntity();
-            event.getVehicle().setMetadata("PLAYEREXPLODED", new FixedMetadataValue( TogglePvp.getPlugin(), damager.getUniqueId().toString()));
+            event.getVehicle().setMetadata("PLAYEREXPLODED", new FixedMetadataValue(PreventStabby.getPlugin(), damager.getUniqueId().toString()));
         }
     }
 

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

@@ -0,0 +1,34 @@
+package me.youhavetrouble.preventstabby.listeners.player;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Firework;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PlayerHitByFireworkListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onFireworkDamage(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+        if (event.getDamager() instanceof Firework && event.getEntity() instanceof Player) {
+            UUID victim = event.getEntity().getUniqueId();
+            Firework firework = (Firework) event.getDamager();
+            if (firework.getShooter() instanceof Player) {
+                UUID damager = ((Player) firework.getShooter()).getUniqueId();
+                if (damager == victim) return;
+
+                if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true))
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
+                else
+                    event.setCancelled(true);
+            }
+        }
+    }
+
+
+}

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

@@ -0,0 +1,59 @@
+package me.youhavetrouble.preventstabby.listeners.player;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.*;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PlayerHitByProjectileListener implements Listener {
+
+    /**
+     * Cancels damage done by projectiles to player with pvp off
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerHitProjectile(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+
+        if (event.getEntity() instanceof Player && event.getDamager() instanceof Projectile) {
+            Projectile projectile = (Projectile) event.getDamager();
+            if (projectile.getShooter() instanceof Player) {
+                UUID damager = ((Player) projectile.getShooter()).getUniqueId();
+                UUID victim = event.getEntity().getUniqueId();
+
+                if (PreventStabby.getPlugin().getConfigCache().isSnowballs_knockback() && event.getDamager() instanceof Snowball) {
+                    if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true)) {
+                        ((Player) event.getEntity()).damage(0.01, (Entity) projectile.getShooter());
+                        CombatTimer.refreshPlayersCombatTime(damager, victim);
+                    } else {
+                        event.setCancelled(true);
+                        return;
+                    }
+
+                } else if (PreventStabby.getPlugin().getConfigCache().isEgg_knockback() && event.getDamager() instanceof Egg) {
+                    if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true)) {
+                        ((Player) event.getEntity()).damage(0.01, (Entity) projectile.getShooter());
+                        CombatTimer.refreshPlayersCombatTime(damager, victim);
+                    } else {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+
+                // Ender pearls and other self-damage
+                if (damager.equals(victim)) return;
+
+                if (event.getDamage() == 0) return;
+
+                if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true))
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
+                else
+                    event.setCancelled(true);
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,48 @@
+package me.youhavetrouble.preventstabby.listeners.player;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import me.youhavetrouble.preventstabby.util.Util;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.potion.PotionEffect;
+
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PlayerHitBySplashPotionListener implements Listener {
+
+    /**
+     * If thrown potion is applies negative effects and it's thrown by a player it will have no effect on player with pvp off
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerHitBySplashPotion(org.bukkit.event.entity.PotionSplashEvent event) {
+
+        if (!(event.getEntity().getShooter() instanceof Player)) return;
+        boolean harmful = false;
+
+        for (PotionEffect effect : event.getPotion().getEffects()) {
+            if (Util.isPotionEffectHarmful(effect.getType())) {
+                harmful = true;
+                break;
+            }
+        }
+        if (!harmful) return;
+        UUID damager = ((Player) event.getEntity().getShooter()).getUniqueId();
+        for (LivingEntity entity : event.getAffectedEntities()) {
+            if (!(entity instanceof Player)) continue;
+            UUID victim = entity.getUniqueId();
+            if (damager == victim) continue;
+            if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true)) {
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            } else {
+                event.setIntensity(entity, 0);
+            }
+
+        }
+    }
+}

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

@@ -0,0 +1,63 @@
+package me.youhavetrouble.preventstabby.listeners.player;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.players.PlayerData;
+import me.youhavetrouble.preventstabby.players.SmartCache;
+import me.youhavetrouble.preventstabby.util.PluginMessages;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+import java.time.Instant;
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PlayerJoinAndLeaveListener implements Listener {
+    /**
+     * This event is here to get players saved options on join
+     */
+    @EventHandler(ignoreCancelled = true)
+    public void onPlayerJoin(org.bukkit.event.player.PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+        UUID uuid = player.getUniqueId();
+
+        PlayerData playerData = PreventStabby.getPlugin().getPlayerManager().getPlayer(player.getUniqueId());
+        long time = Instant.now().getEpochSecond();
+        if (playerData == null) {
+            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);
+                data.setLoginTimestamp(time);
+            });
+            return;
+        }
+        playerData.refreshCachetime();
+        playerData.setLoginTimestamp(time);
+    }
+
+    /**
+     * This event is here to save player's data to database
+     * Also punishes players who log out during combat
+     */
+    @EventHandler
+    public void onPlayerLeave(org.bukkit.event.player.PlayerQuitEvent event) {
+        Player player = event.getPlayer();
+        Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> PreventStabby.getPlugin().getSqLite().updatePlayerInfo(player.getUniqueId(), PreventStabby.getPlugin().getPlayerManager().getPlayer(player.getUniqueId())));
+
+        if (!PreventStabby.getPlugin().getConfigCache().isPunish_for_combat_logout()) return;
+
+        SmartCache smartCache = PreventStabby.getPlugin().getSmartCache();
+        PlayerData playerData = smartCache.getPlayerData(player.getUniqueId());
+
+        if (!playerData.isInCombat()) return;
+
+        player.setHealth(0);
+        if (PreventStabby.getPlugin().getConfigCache().isPunish_for_combat_logout_announce())
+            PluginMessages.broadcastMessage(player, PreventStabby.getPlugin().getConfigCache().getPunish_for_combat_logout_message());
+
+
+    }
+}

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

@@ -0,0 +1,24 @@
+package me.youhavetrouble.preventstabby.listeners.player;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.players.PlayerData;
+import me.youhavetrouble.preventstabby.players.SmartCache;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import java.time.Instant;
+
+@PreventStabbyListener
+public class PlayerTeleportListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPlayerTeleport(org.bukkit.event.player.PlayerTeleportEvent event) {
+        Player player = event.getPlayer();
+        SmartCache smartCache = PreventStabby.getPlugin().getSmartCache();
+        PlayerData playerData = smartCache.getPlayerData(player.getUniqueId());
+        playerData.setTeleportTimestamp(Instant.now().getEpochSecond());
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/toggles/CombatCommandListener.java

@@ -0,0 +1,38 @@
+package me.youhavetrouble.preventstabby.listeners.toggles;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.players.PlayerManager;
+import me.youhavetrouble.preventstabby.util.PluginMessages;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+@PreventStabbyListener
+public class CombatCommandListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerCommandInCombat(org.bukkit.event.player.PlayerCommandPreprocessEvent event) {
+
+        if (!PreventStabby.getPlugin().getConfigCache().isBlock_commands_in_combat())
+            return;
+
+        PlayerManager playerManager = PreventStabby.getPlugin().getPlayerManager();
+
+        if (!playerManager.getPlayer(event.getPlayer().getUniqueId()).isInCombat())
+            return;
+
+        String command = event.getMessage().replaceFirst("/", "");
+
+        if (!PreventStabby.getPlugin().getConfigCache().getCombatBlockedCommands().contains(command))
+            return;
+
+        if (event.getPlayer().hasPermission("toglepvp.combatcommandblock.bypass"))
+            return;
+
+        event.setCancelled(true);
+        PluginMessages.sendMessage(event.getPlayer(), PreventStabby.getPlugin().getConfigCache().getCant_do_that_during_combat());
+
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/toggles/PlayerTeleportInCombatListener.java

@@ -0,0 +1,33 @@
+package me.youhavetrouble.preventstabby.listeners.toggles;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.players.PlayerManager;
+import me.youhavetrouble.preventstabby.util.PluginMessages;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+@PreventStabbyListener
+public class PlayerTeleportInCombatListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerTeleportInCombat(org.bukkit.event.player.PlayerTeleportEvent event) {
+
+        if (!PreventStabby.getPlugin().getConfigCache().isBlock_teleports_in_combat())
+            return;
+
+        PlayerManager playerManager = PreventStabby.getPlugin().getPlayerManager();
+
+        if (!playerManager.getPlayer(event.getPlayer().getUniqueId()).isInCombat())
+            return;
+
+        if (event.getPlayer().hasPermission("toglepvp.combatteleportblock.bypass"))
+            return;
+
+        event.setCancelled(true);
+        PluginMessages.sendMessage(event.getPlayer(), PreventStabby.getPlugin().getConfigCache().getCant_do_that_during_combat());
+
+    }
+
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/unspecific/AreaEffectCloudApplyListener.java

@@ -0,0 +1,75 @@
+package me.youhavetrouble.preventstabby.listeners.unspecific;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.players.PlayerManager;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.AreaEffectCloudApplyEvent;
+import org.bukkit.potion.PotionEffectType;
+import java.util.Iterator;
+import java.util.UUID;
+
+@PreventStabbyListener
+public class AreaEffectCloudApplyListener implements Listener {
+
+    @EventHandler(ignoreCancelled = true)
+    public void onCloudEffects(AreaEffectCloudApplyEvent event) {
+
+        PotionEffectType potionEffectType = event.getEntity().getBasePotionData().getType().getEffectType();
+
+        if (potionEffectType == null)
+            return;
+
+        if(event.getEntity().getSource() instanceof Player) {
+            if (potionEffectType.equals(PotionEffectType.BLINDNESS) ||
+                    potionEffectType.equals(PotionEffectType.CONFUSION) ||
+                    potionEffectType.equals(PotionEffectType.HARM) ||
+                    potionEffectType.equals(PotionEffectType.HUNGER) ||
+                    potionEffectType.equals(PotionEffectType.POISON) ||
+                    potionEffectType.equals(PotionEffectType.SLOW_DIGGING) ||
+                    potionEffectType.equals(PotionEffectType.WEAKNESS) ||
+                    potionEffectType.equals(PotionEffectType.SLOW) ||
+                    potionEffectType.equals(PotionEffectType.WITHER)) {
+
+                PlayerManager playerManager = PreventStabby.getPlugin().getPlayerManager();
+
+                Iterator<LivingEntity> it = event.getAffectedEntities().iterator();
+                UUID damager = ((Player) event.getEntity().getSource()).getUniqueId();
+                while(it.hasNext()) {
+                    LivingEntity entity = it.next();
+                    if(entity instanceof Player) {
+
+                        UUID victim = entity.getUniqueId();
+                        if (damager == victim)
+                            continue;
+
+                        if (playerManager.canDamage(damager, victim, true))
+                            CombatTimer.refreshPlayersCombatTime(damager, victim);
+                        else
+                            it.remove();
+
+                    } else if (entity instanceof Tameable) {
+                        Tameable tameable = (Tameable) entity;
+
+                        if (tameable.getOwner() == null)
+                            continue;
+
+                        UUID victim = tameable.getOwner().getUniqueId();
+                        if (victim == damager)
+                            continue;
+
+                        if (playerManager.canDamage(damager, victim, true, false))
+                            CombatTimer.refreshPlayersCombatTime(damager, victim);
+                        else
+                            it.remove();
+                    }
+                }
+            }
+        }
+    }
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/unspecific/EntityHitByLightningListener.java

@@ -1,21 +1,22 @@
-package eu.endermite.togglepvp.listeners.unspecific;
+package me.youhavetrouble.preventstabby.listeners.unspecific;
 
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.players.SmartCache;
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
 import org.bukkit.entity.LightningStrike;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
+import org.bukkit.entity.Tameable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.weather.LightningStrikeEvent;
 import org.bukkit.metadata.FixedMetadataValue;
+import java.util.UUID;
 
 /**
  * Listen for lightning strikes and tag the trident spawned ones.
  * Idea from aasmus' PvPToggle plugin
  */
-@eu.endermite.togglepvp.util.Listener
+@PreventStabbyListener
 public class EntityHitByLightningListener implements Listener {
 
     /**
@@ -25,15 +26,19 @@ public class EntityHitByLightningListener implements Listener {
     public void onPlayerLightningDamage(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
         if (event.getDamager() instanceof LightningStrike && event.getDamager().getMetadata("TRIDENT").size() >= 1) {
             if (event.getEntity() instanceof Player) {
-                Player victim = (Player) event.getEntity();
-                boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
-                if (!victimPvpEnabled) {
+                UUID victim = event.getEntity().getUniqueId();
+
+                if (PreventStabby.getPlugin().getPlayerManager().hasLoginProtection(victim)) {
+                    event.setCancelled(true);
+                    return;
+                }
+
+                if (!PreventStabby.getPlugin().getSmartCache().getPlayerData(victim).isPvpEnabled()) {
                     event.setCancelled(true);
                 }
-            } else if (event.getEntity() instanceof Wolf) {
-                Wolf victim = (Wolf) event.getEntity();
-                boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
-                if (!victimPvpEnabled) {
+            } else if (event.getEntity() instanceof Tameable) {
+                Tameable victim = (Tameable) event.getEntity();
+                if (victim.getOwner() != null && !PreventStabby.getPlugin().getSmartCache().getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled()) {
                     event.setCancelled(true);
                 }
             }
@@ -46,11 +51,11 @@ public class EntityHitByLightningListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onLightningStrike(LightningStrikeEvent event){
         if(event.getCause() == LightningStrikeEvent.Cause.TRIDENT){
-            if (TogglePvp.getPlugin().getConfigCache().isChanneling_enchant_disabled()) {
+            if (PreventStabby.getPlugin().getConfigCache().isChanneling_enchant_disabled()) {
                 event.setCancelled(true);
                 return;
             }
-            event.getLightning().setMetadata("TRIDENT", new FixedMetadataValue(TogglePvp.getPlugin(), event.getLightning().getLocation()));
+            event.getLightning().setMetadata("TRIDENT", new FixedMetadataValue(PreventStabby.getPlugin(), event.getLightning().getLocation()));
         }
     }
 }

src/main/java/me/youhavetrouble/preventstabby/listeners/unspecific/FishingListener.java

@@ -0,0 +1,48 @@
+package me.youhavetrouble.preventstabby.listeners.unspecific;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import java.util.UUID;
+
+@PreventStabbyListener
+public class FishingListener implements Listener {
+
+    /**
+     * Prevents hooking players with disabled pvp with fishing rod
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onFish(org.bukkit.event.player.PlayerFishEvent event) {
+        if (event.getCaught() instanceof Player) {
+            UUID damager = event.getPlayer().getUniqueId();
+            UUID victim = event.getCaught().getUniqueId();
+            if (damager == victim)
+                return;
+
+            if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
+                event.setCancelled(true);
+        } else if (event.getCaught() instanceof Tameable) {
+            Tameable tameable = (Tameable) event.getCaught();
+            UUID damager = event.getPlayer().getUniqueId();
+            if (tameable.getOwner() == null)
+                return;
+
+            UUID victim = tameable.getOwner().getUniqueId();
+
+            if (damager == victim)
+                return;
+
+            if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
+                event.setCancelled(true);
+        }
+    }
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/unspecific/LavaDumpAndIgniteListener.java

@@ -0,0 +1,125 @@
+package me.youhavetrouble.preventstabby.listeners.unspecific;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.config.ConfigCache;
+import me.youhavetrouble.preventstabby.util.BoundingBoxUtil;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.util.BoundingBox;
+
+import java.util.UUID;
+
+
+@PreventStabbyListener
+public class LavaDumpAndIgniteListener implements Listener {
+
+    /**
+     * Prevents dumping lava and pufferfish bucket near players with pvp off
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onLavaDump(org.bukkit.event.player.PlayerBucketEmptyEvent event) {
+
+        ConfigCache config = PreventStabby.getPlugin().getConfigCache();
+
+        if (!config.isLava_and_fire_stopper_enabled())
+            return;
+
+        if (event.getBucket().equals(Material.LAVA_BUCKET) || event.getBucket().equals(Material.PUFFERFISH_BUCKET)) {
+            Location location = event.getBlockClicked().getLocation();
+            UUID damager = event.getPlayer().getUniqueId();
+            double radius = config.getLava_and_fire_stopper_radius();
+
+            BoundingBox boundingBox = BoundingBoxUtil.getBoundingBox(location, radius);
+            for (Entity entity : location.getWorld().getNearbyEntities(boundingBox)) {
+                if (entity instanceof Player) {
+                    UUID victim = entity.getUniqueId();
+                    if (victim != damager) {
+                        if (PreventStabby.getPlugin().getPlayerManager().hasLoginProtection(victim, damager)) {
+                            event.setCancelled(true);
+                            return;
+                        }
+
+                        if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true))
+                            CombatTimer.refreshPlayersCombatTime(damager, victim);
+                        else
+                            event.setCancelled(true);
+
+                    }
+                } else if (entity instanceof Tameable) {
+                    Tameable tameable = (Tameable) entity;
+                    if (tameable.getOwner() == null) {
+                        return;
+                    }
+
+                    UUID victim = tameable.getOwner().getUniqueId();
+                    if (PreventStabby.getPlugin().getPlayerManager().hasLoginProtection(victim, damager)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+
+                    if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true))
+                        CombatTimer.refreshPlayersCombatTime(damager, victim);
+                    else
+                        event.setCancelled(true);
+
+                }
+            }
+        }
+    }
+
+    /**
+     * Prevents setting blocks on fire near players with pvp off
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onIgnite(org.bukkit.event.block.BlockIgniteEvent event) {
+
+        ConfigCache config = PreventStabby.getPlugin().getConfigCache();
+
+        if (!config.isLava_and_fire_stopper_enabled())
+            return;
+
+        if (event.getPlayer() == null)
+            return;
+
+        Location location = event.getBlock().getLocation();
+        UUID damager = event.getPlayer().getUniqueId();
+        double radius = config.getLava_and_fire_stopper_radius();
+        BoundingBox boundingBox = BoundingBoxUtil.getBoundingBox(location, radius);
+        for (Entity entity : location.getWorld().getNearbyEntities(boundingBox)) {
+            if (entity instanceof Player) {
+                UUID victim = entity.getUniqueId();
+                if (victim == damager)
+                    continue;
+
+                if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true))
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
+                else
+                    event.setCancelled(true);
+
+            } else if (entity instanceof Tameable) {
+                Tameable tameable = (Tameable) entity;
+                if (tameable.getOwner() == null) {
+                    continue;
+                }
+
+                UUID victim = tameable.getOwner().getUniqueId();
+                if (victim == damager)
+                    continue;
+
+                if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
+                else
+                    event.setCancelled(true);
+            }
+        }
+
+    }
+}

src/main/java/me/youhavetrouble/preventstabby/listeners/unspecific/LightningBlockIgniteListener.java

@@ -1,16 +1,13 @@
-package eu.endermite.togglepvp.listeners.unspecific;
+package me.youhavetrouble.preventstabby.listeners.unspecific;
 
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.players.SmartCache;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LightningStrike;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-@eu.endermite.togglepvp.util.Listener
+@PreventStabbyListener
 public class LightningBlockIgniteListener implements Listener {
 
     /**
@@ -25,16 +22,22 @@ public class LightningBlockIgniteListener implements Listener {
             for (Entity entity : lightningStrike.getNearbyEntities(2,2,2)) {
                 if (entity instanceof Player) {
                     Player victim = (Player) entity;
-                    if (!TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId())) {
+
+                    if (PreventStabby.getPlugin().getPlayerManager().hasLoginProtection(victim.getUniqueId())) {
                         event.setCancelled(true);
                         return;
                     }
-                } else if (entity instanceof Wolf) {
-                    Wolf victim = (Wolf) entity;
+
+                    if (!PreventStabby.getPlugin().getSmartCache().getPlayerData(victim.getUniqueId()).isPvpEnabled()) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                } else if (entity instanceof Tameable) {
+                    Tameable victim = (Tameable) entity;
                     if (victim.getOwner() == null) {
                         return;
                     }
-                    if (!SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled()) {
+                    if (!PreventStabby.getPlugin().getSmartCache().getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled()) {
                         event.setCancelled(true);
                         return;
                     }

src/main/java/me/youhavetrouble/preventstabby/listeners/unspecific/PlaceWitherRoseListener.java

@@ -0,0 +1,64 @@
+package me.youhavetrouble.preventstabby.listeners.unspecific;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.config.ConfigCache;
+import me.youhavetrouble.preventstabby.util.BoundingBoxUtil;
+import me.youhavetrouble.preventstabby.util.CombatTimer;
+import me.youhavetrouble.preventstabby.util.PreventStabbyListener;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.util.BoundingBox;
+
+import java.util.UUID;
+
+@PreventStabbyListener
+public class PlaceWitherRoseListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerWitherRosePlace(org.bukkit.event.block.BlockPlaceEvent event) {
+
+        ConfigCache config = PreventStabby.getPlugin().getConfigCache();
+
+        if (!config.isLava_and_fire_stopper_enabled())
+            return;
+
+        if (event.getBlock().getType().equals(Material.WITHER_ROSE)) {
+            Location location = event.getBlockPlaced().getLocation();
+            double radius = config.getLava_and_fire_stopper_radius();
+            BoundingBox boundingBox = BoundingBoxUtil.getBoundingBox(location, radius);
+            for (Entity entity : location.getWorld().getNearbyEntities(boundingBox)) {
+                if (entity instanceof Player) {
+                    UUID damager = event.getPlayer().getUniqueId();
+                    UUID victim = entity.getUniqueId();
+                    if (victim == damager)
+                        return;
+
+                    if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true))
+                        CombatTimer.refreshPlayersCombatTime(damager, victim);
+                    else
+                        event.setCancelled(true);
+                } else if (entity instanceof Tameable) {
+                    Tameable tameable = (Tameable) entity;
+                    UUID damager = event.getPlayer().getUniqueId();
+                    if (tameable.getOwner() == null)
+                        return;
+
+                    UUID victim = tameable.getOwner().getUniqueId();
+                    if (victim == damager)
+                        return;
+
+                    if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                        CombatTimer.refreshPlayersCombatTime(damager, victim);
+                    else
+                        event.setCancelled(true);
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,87 @@
+package me.youhavetrouble.preventstabby.players;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+
+import java.time.Instant;
+import java.util.UUID;
+
+public class PlayerData {
+
+    private final UUID playerUuid;
+    private long cachetime, combattime, loginTimestamp, teleportTimestamp;
+    private boolean pvpEnabled, lastCombatCheck, inCombat;
+
+    public PlayerData(UUID playerUuid, boolean pvpEnabled) {
+        this.playerUuid = playerUuid;
+        this.pvpEnabled = pvpEnabled;
+        this.combattime = Instant.now().getEpochSecond()-1;
+        this.loginTimestamp = Instant.now().getEpochSecond()-1;
+        this.teleportTimestamp = Instant.now().getEpochSecond()-1;
+        this.inCombat = false;
+        refreshCachetime();
+    }
+
+    public UUID getPlayerUuid() {
+        return playerUuid;
+    }
+
+    public boolean isPvpEnabled() {
+        return pvpEnabled;
+    }
+
+    public void setPvpEnabled(boolean pvpEnabled) {
+        this.pvpEnabled = pvpEnabled;
+    }
+
+    public long getCachetime() {
+        return cachetime;
+    }
+
+    public void refreshCachetime() {
+        this.cachetime = Instant.now().getEpochSecond()+ PreventStabby.getPlugin().getConfigCache().getCache_time();
+    }
+
+    public long getCombattime() {
+        return combattime;
+    }
+
+    public void setCombattime(long combattime) {
+        this.combattime = combattime;
+    }
+
+    public void refreshCombatTime() {
+        this.combattime = Instant.now().getEpochSecond()+ PreventStabby.getPlugin().getConfigCache().getCombat_time();
+    }
+
+    public boolean getLastCombatCheck() {
+        return lastCombatCheck;
+    }
+
+    public void setLastCombatCheck(boolean bool) {
+        lastCombatCheck = bool;
+    }
+
+    public void setLoginTimestamp(long loginTimestamp) {
+        this.loginTimestamp = loginTimestamp + PreventStabby.getPlugin().getConfigCache().getLogin_protection_time()-1;
+    }
+
+    public long getLoginTimestamp() {
+        return loginTimestamp;
+    }
+
+    public void setTeleportTimestamp(long teleportTimestamp) {
+        this.teleportTimestamp = teleportTimestamp + PreventStabby.getPlugin().getConfigCache().getTeleport_protection_time()-1;
+    }
+
+    public long getTeleportTimestamp() {
+        return teleportTimestamp;
+    }
+
+    public boolean isInCombat() {
+        return inCombat;
+    }
+
+    public void setInCombat(boolean inCombat) {
+        this.inCombat = inCombat;
+    }
+}

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

@@ -0,0 +1,165 @@
+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;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitTask;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.UUID;
+
+public class PlayerManager {
+
+    @Getter
+    HashMap<UUID, PlayerData> playerList = new HashMap<>();
+
+    public final BukkitTask combatTrackerTask;
+
+    public PlayerManager() {
+        for (Player p : Bukkit.getOnlinePlayers()) {
+            PlayerData playerData = PreventStabby.getPlugin().getSqLite().getPlayerInfo(p.getUniqueId());
+            playerList.put(p.getUniqueId(), playerData);
+        }
+
+        combatTrackerTask = Bukkit.getScheduler().runTaskTimerAsynchronously(PreventStabby.getPlugin(), () -> {
+            Iterator<PlayerData> iterator = playerList.values().iterator();
+            while (iterator.hasNext()) {
+                PlayerData playerData = iterator.next();
+                UUID uuid = playerData.getPlayerUuid();
+                if (!CombatTimer.isInCombat(uuid)) {
+                    if (playerData.getLastCombatCheck()) {
+                        Player player = Bukkit.getPlayer(uuid);
+                        if (player == null) continue;
+                        PlayerLeaveCombatEvent playerLeaveCombatEvent = new PlayerLeaveCombatEvent(player);
+                        Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> {
+                            Bukkit.getPluginManager().callEvent(playerLeaveCombatEvent);
+                            if (playerLeaveCombatEvent.isCancelled()) {
+                                playerData.refreshCombatTime();
+                                return;
+                            }
+                            playerData.setLastCombatCheck(false);
+                            playerData.setInCombat(false);
+                            PluginMessages.sendActionBar(uuid, PreventStabby.getPlugin().getConfigCache().getLeaving_combat());
+                        });
+                    }
+                } else {
+                    playerData.setLastCombatCheck(true);
+                }
+            }
+        }, 20, 20);
+
+
+    }
+
+    public void refreshPlayersCacheTime(UUID uuid) {
+        playerList.get(uuid).refreshCachetime();
+    }
+
+    public void refreshPlayersCombatTime(UUID uuid) {
+        try {
+            PlayerData data = playerList.get(uuid);
+            if (data == null)
+                return;
+            Player player = Bukkit.getPlayer(uuid);
+            if (player == null || player.isDead())
+                return;
+
+            data.refreshCombatTime();
+            data.setInCombat(true);
+        } catch (Exception ignored) {
+        }
+    }
+
+    public PlayerData getPlayer(UUID uuid) {
+        return playerList.get(uuid);
+    }
+
+    public void addPlayer(UUID uuid, PlayerData data) {
+        playerList.put(uuid, data);
+    }
+
+    public boolean getPlayerPvPState(UUID uuid) {
+        return PreventStabby.getPlugin().getSmartCache().getPlayerData(uuid).isPvpEnabled();
+    }
+
+    public void setPlayerPvpState(UUID uuid, boolean state) {
+        PreventStabby.getPlugin().getSmartCache().getPlayerData(uuid).setPvpEnabled(state);
+    }
+
+    public boolean togglePlayerPvpState(UUID uuid) {
+        SmartCache smartCache = PreventStabby.getPlugin().getSmartCache();
+        if (smartCache.getPlayerData(uuid).isPvpEnabled()) {
+            smartCache.getPlayerData(uuid).setPvpEnabled(false);
+            return false;
+        } else {
+            smartCache.getPlayerData(uuid).setPvpEnabled(true);
+            return true;
+        }
+    }
+
+    public boolean canDamage(UUID attacker, UUID victim, boolean sendDenyMessage) {
+        return canDamage(attacker, victim, sendDenyMessage, true);
+    }
+
+    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;
+
+        SmartCache smartCache = PreventStabby.getPlugin().getSmartCache();
+
+        Player attackerPlayer = Bukkit.getPlayer(attacker);
+        Player victimPlayer = Bukkit.getPlayer(victim);
+
+        if (!smartCache.getPlayerData(attacker).isPvpEnabled() && (attackerPlayer != null && !isInForcedPvpRegion(attackerPlayer))) {
+            if (sendDenyMessage) {
+                ConfigCache config = PreventStabby.getPlugin().getConfigCache();
+                PluginMessages.sendActionBar(attacker, config.getCannot_attack_attacker());
+            }
+            return false;
+        }
+        if (!smartCache.getPlayerData(victim).isPvpEnabled() && (victimPlayer != null && !isInForcedPvpRegion(victimPlayer))) {
+            if (sendDenyMessage) {
+                ConfigCache config = PreventStabby.getPlugin().getConfigCache();
+                PluginMessages.sendActionBar(attacker, config.getCannot_attack_victim());
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @param uuid Player UUIDs
+     * @return true if any of the provided UUIDs has spawn protection
+     */
+    public boolean hasLoginProtection(UUID... uuid) {
+        SmartCache smartCache = PreventStabby.getPlugin().getSmartCache();
+        for (UUID checkedUuid : uuid) {
+            if (Instant.now().getEpochSecond() < smartCache.getPlayerData(checkedUuid).getLoginTimestamp())
+                return true;
+        }
+        return false;
+    }
+
+    public boolean hasTeleportProtection(UUID uuid) {
+        SmartCache smartCache = PreventStabby.getPlugin().getSmartCache();
+        return Instant.now().getEpochSecond() < smartCache.getPlayerData(uuid).getTeleportTimestamp();
+    }
+
+    public boolean isInForcedPvpRegion(Player player) {
+        if (!WorldGuardHook.isHooked()) return false;
+        return WorldGuardHook.isPlayerForcedToPvp(player);
+    }
+
+}

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

@@ -0,0 +1,60 @@
+package me.youhavetrouble.preventstabby.players;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import java.time.Instant;
+import java.util.Map;
+import java.util.UUID;
+
+public class SmartCache {
+
+    public void runSmartCache() {
+        Bukkit.getScheduler().runTaskTimerAsynchronously(PreventStabby.getPlugin(), () -> {
+            // Refresh cache timer if player is online
+            for (Map.Entry<UUID, PlayerData> e : PreventStabby.getPlugin().getPlayerManager().getPlayerList().entrySet()) {
+                try {
+                    Player player = Bukkit.getPlayer(e.getKey());
+                    if (player != null && player.isOnline()) {
+                        PreventStabby.getPlugin().getPlayerManager().refreshPlayersCacheTime(e.getKey());
+                    }
+                } catch (NullPointerException ignored) {}
+            }
+            // Check for entries that should be invalidated
+            try {
+                long now = Instant.now().getEpochSecond();
+                PreventStabby.getPlugin().getPlayerManager().getPlayerList().entrySet()
+                        .removeIf(cacheEntry -> cacheEntry.getValue().getCachetime() < now);
+            } catch (Exception ignored) {}
+        }, 100, 100);
+    }
+
+    public PlayerData getPlayerData(UUID uuid) {
+        // Try to get data from cache and refresh it
+        try {
+            PreventStabby.getPlugin().getPlayerManager().refreshPlayersCacheTime(uuid);
+            return PreventStabby.getPlugin().getPlayerManager().getPlayer(uuid);
+        } catch (NullPointerException e) {
+            // If player data is not in cache get it from database and put into cache
+            try {
+                PlayerData playerData = PreventStabby.getPlugin().getSqLite().getPlayerInfo(uuid);
+                PreventStabby.getPlugin().getPlayerManager().addPlayer(uuid, playerData);
+                return playerData;
+            } catch (NullPointerException ex) {
+                // Return false if database call fails
+                return new PlayerData(uuid,false);
+            }
+        }
+    }
+
+    public void setPlayerPvpState(UUID uuid, boolean state) {
+        // If player is in cache update that
+        if (PreventStabby.getPlugin().getPlayerManager().getPlayer(uuid) != null) {
+            PreventStabby.getPlugin().getPlayerManager().getPlayer(uuid).setPvpEnabled(state);
+        }
+        // Update the database aswell
+        PreventStabby.getPlugin().getSqLite().updatePlayerInfo(uuid, new PlayerData(uuid, state));
+    }
+
+
+}

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

@@ -1,4 +1,4 @@
-package eu.endermite.togglepvp.util;
+package me.youhavetrouble.preventstabby.util;
 
 import org.bukkit.Location;
 import org.bukkit.util.BoundingBox;

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

@@ -0,0 +1,47 @@
+package me.youhavetrouble.preventstabby.util;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.api.event.PlayerEnterCombatEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import java.time.Instant;
+import java.util.UUID;
+
+public class CombatTimer {
+
+    public static void refreshPlayersCombatTime(UUID uuid) {
+        try {
+            long now = Instant.now().getEpochSecond();
+            long combattime = PreventStabby.getPlugin().getSmartCache().getPlayerData(uuid).getCombattime();
+
+            Player player = Bukkit.getPlayer(uuid);
+            if (player == null || !player.isOnline()) return;
+            PlayerEnterCombatEvent playerEnterCombatEvent = new PlayerEnterCombatEvent(player);
+            Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> {
+                Bukkit.getPluginManager().callEvent(playerEnterCombatEvent);
+                if (playerEnterCombatEvent.isCancelled()) return;
+                PreventStabby.getPlugin().getPlayerManager().refreshPlayersCombatTime(uuid);
+
+                if (combattime <= now) {
+                    PluginMessages.sendActionBar(uuid, PreventStabby.getPlugin().getConfigCache().getEntering_combat());
+                }
+            });
+        } catch (Exception ignored) {
+        }
+    }
+
+    public static void refreshPlayersCombatTime(UUID... uuid) {
+        for (UUID id : uuid) {
+            refreshPlayersCombatTime(id);
+        }
+    }
+
+    public static boolean isInCombat(UUID uuid) {
+        try {
+            return PreventStabby.getPlugin().getPlayerManager().getPlayer(uuid).getCombattime() >= Instant.now().getEpochSecond();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+}

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

@@ -1,7 +1,7 @@
-package eu.endermite.togglepvp.util;
+package me.youhavetrouble.preventstabby.util;
 
-import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.players.PlayerData;
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.players.PlayerData;
 
 import java.io.File;
 import java.sql.*;
@@ -41,27 +41,22 @@ public class DatabaseSQLite {
         try {
             conn = DriverManager.getConnection(url);
             System.out.println("Connection to SQLite has been established.");
-        } catch (SQLException e) {
-            System.out.println(e.getMessage());
-        } finally {
-            try {
             if (conn != null) {
                 conn.close();
+                return true;
             }
-            } catch (SQLException ex) {
-                System.out.println(ex.getMessage());
-            }
+        } catch (SQLException e) {
+            System.out.println(e.getMessage());
         }
         return false;
     }
 
     public PlayerData getPlayerInfo(UUID uuid) {
-
         try {
             Connection conn = DriverManager.getConnection(url);
             Statement insertnewuser = conn.createStatement();
             try {
-                String newuserdata = "INSERT OR IGNORE INTO `players` (player_uuid, pvpenabled) VALUES ('" + uuid.toString() + "', " + TogglePvp.getPlugin().getConfigCache().isPvp_enabled_by_default() + ")";
+                String newuserdata = "INSERT OR IGNORE INTO `players` (player_uuid, pvpenabled) VALUES ('" + uuid.toString() + "', " + PreventStabby.getPlugin().getConfigCache().isPvp_enabled_by_default() + ")";
                 insertnewuser.execute(newuserdata);
             } catch (SQLException e) {
                 if (e.getErrorCode() != 19) {
@@ -69,11 +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(result.getBoolean("pvpenabled"));
+            return new PlayerData(uuid, state);
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
@@ -88,7 +84,7 @@ public class DatabaseSQLite {
                 String newuserdata = "UPDATE `players` SET pvpenabled = "+data.isPvpEnabled()+" WHERE `player_uuid` = '"+uuid.toString()+"';";
                 insertnewuser.execute(newuserdata);
             } catch (SQLException e) {
-                TogglePvp.getPlugin().getLogger().severe("Error while saving player data!");
+                PreventStabby.getPlugin().getLogger().severe("Error while saving player data!");
                 e.printStackTrace();
             }
         } catch (SQLException throwables) {

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

@@ -1,4 +1,4 @@
-package eu.endermite.togglepvp.util;
+package me.youhavetrouble.preventstabby.util;
 
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.BaseComponent;
@@ -17,7 +17,13 @@ public class PluginMessages {
         return ChatColor.translateAlternateColorCodes('&', message);
     }
 
+    public static void sendMessage(Player player, String message) {
+        String parsedMessage = ChatColor.translateAlternateColorCodes('&', message);
+        player.sendMessage(parsedMessage);
+    }
+
     public static void sendActionBar(Player player, String message) {
+        // TODO use adventure
         BaseComponent[] component = TextComponent.fromLegacyText(parseMessage(message));
         player.spigot().sendMessage(ChatMessageType.ACTION_BAR, component);
     }

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

@@ -1,4 +1,4 @@
-package eu.endermite.togglepvp.util;
+package me.youhavetrouble.preventstabby.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,4 +8,4 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 
-public @interface Listener {}
+public @interface PreventStabbyListener {}

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

@@ -0,0 +1,71 @@
+package me.youhavetrouble.preventstabby.util;
+
+import me.youhavetrouble.preventstabby.PreventStabby;
+import me.youhavetrouble.preventstabby.config.ConfigCache;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffectType;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+public class Util {
+
+       private static final HashSet<PotionEffectType> harmfulPotions = new HashSet<>();
+
+       public static void initData() {
+           harmfulPotions.add(PotionEffectType.BLINDNESS);
+           harmfulPotions.add(PotionEffectType.CONFUSION);
+           harmfulPotions.add(PotionEffectType.HARM);
+           harmfulPotions.add(PotionEffectType.HUNGER);
+           harmfulPotions.add(PotionEffectType.POISON);
+           harmfulPotions.add(PotionEffectType.SLOW_DIGGING);
+           harmfulPotions.add(PotionEffectType.WEAKNESS);
+           harmfulPotions.add(PotionEffectType.SLOW);
+           harmfulPotions.add(PotionEffectType.WITHER);
+       }
+
+    /**
+     * @param attacker Player attacking the mount
+     * @param mount Entity being ridden
+     * @return true if event should be cancelled
+     */
+    public static boolean processMountAttack(UUID attacker, Entity mount) {
+
+        // Don't cancel attacks on players that have passengers
+        if (mount instanceof Player) return false;
+
+        ConfigCache config = PreventStabby.getPlugin().getConfigCache();
+
+        if (!PreventStabby.getPlugin().getPlayerManager().getPlayerPvPState(attacker)) {
+            PluginMessages.sendActionBar(attacker, config.getCannot_attack_mounts_attacker());
+            return true;
+        }
+
+        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 (hasPlayerPassengers && playerPassengersWithPvpEnabled.isEmpty()) {
+            PluginMessages.sendActionBar(attacker, config.getCannot_attack_mounts_victim());
+            return true;
+        }
+
+        playerPassengersWithPvpEnabled.forEach(CombatTimer::refreshPlayersCombatTime);
+        CombatTimer.refreshPlayersCombatTime(attacker);
+        return false;
+    }
+
+    public static boolean isPotionEffectHarmful(PotionEffectType effect) {
+        return harmfulPotions.contains(effect);
+    }
+
+}

src/main/resources/config.yml

@@ -1,41 +0,0 @@
-settings:
-  # Decides if pvp should be enabled or disabled by default
-  pvp_enabled_by_default: false
-
-  # Prevents dumping lava and pufferfish bucket, placing wither roses and lighting blocks on fire near players with pvp off
-  lava_and_fire_stopper:
-    enabled: true
-    radius: 2.5
-
-  # Disables channeling (trident enchant) lightning strike
-  # You may want to keep it disabled because players with pvp off can use it to attack players with pvp on
-  channeling_enchant_disabled: false
-
-  # Time (in seconds) to keep player in combat
-  combat_time: 25
-
-  # Kill the player if they log out during combat
-  punish_for_combat_logout:
-    enabled: true
-    announce: true
-    message: "&f%player% logged out while in combat. What a loser."
-
-  # Time (in seconds) to keep player data in memory when players goes offline.
-  # This is used for checking if offline players pvp state.
-  # Adjust only if you know what you're doing. NEVER set to less than 6.
-  cache_time: 30
-
-messages:
-  pvp_enabled: "&cYou enabled PvP!"
-  pvp_disabled: "&cYou disabled PvP!"
-  cannot_attack_victim: "&cYou can't attack players that have PvP turned off!"
-  cannot_attack_attacker: "&cYou can't attack players while you have PvP turned off!"
-  cannot_attack_pets_victim: "&cYou can't attack pets of players that have PvP turned off"
-  cannot_attack_pets_attacker: "&cYou can't attack pets while you have PvP turned off"
-  no_permission: "&cYou don't have permission to use that."
-  no_such_command: "&cNo such command."
-  pvp_enabled_others: "&cYou've enabled %player%'s PvP."
-  pvp_disabled_others: "&cYou've disabled %player%'s PvP."
-  entering_combat: "&cEntering combat"
-  leaving_combat: "&cLeaving combat"
-  cant_do_that_during_combat: "&cYou can't do that while in combat!"

src/main/resources/plugin.yml

@@ -1,13 +1,23 @@
-name: TogglePvP
+name: PreventStabby
 version: ${project.version}
-main: eu.endermite.togglepvp.TogglePvP
+main: me.youhavetrouble.preventstabby.PreventStabby
 authors: [YouHaveTrouble]
 api-version: 1.13
-description: PvP toggle plugin
+description: Stop people from getting stabbed!
+soft-depend:
+  - WorldGuard
 commands:
-  pvp:
-    usage: /pvp [args]
+  preventstabby:
+    permission: preventstabby.command
+    aliases:
+      - pvp
 permissions:
+  toglepvp.combatcommandblock.bypass:
+    default: op
+    description: Allows to bypass combat command blocker
+  toglepvp.combatteleportblock.bypass:
+    default: op
+    description: Allows to bypass combat teleport blocker
   togglepvp.command:
     default: true
     description: Allows usage of /pvp command