added bstats

.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

@@ -6,7 +6,7 @@
 
     <groupId>eu.endermite</groupId>
     <artifactId>TogglePvP</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
     <packaging>jar</packaging>
 
     <name>TogglePvP</name>
@@ -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,17 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</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 +97,17 @@
             <artifactId>reflections</artifactId>
             <version>0.9.12</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.Thatsmusic99</groupId>
+            <artifactId>ConfigurationMaster</artifactId>
+            <version>v1.0-RC-2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>2.2.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

readme.md

@@ -1,23 +1,21 @@
 <h2>TogglePvP ⚔</h2>
 
-Plugin is under heavy development and things will change often.
-
 Use Issues section to report bugs or submit suggestions.
 
 <h3>Commands</h3>
-Permission: <code>togglepvp.command</code> (given by default) :
+Permission: <code>togglepvp.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>togglepvp.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>togglepvp.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/TogglePvp.java

@@ -7,6 +7,8 @@ import eu.endermite.togglepvp.players.SmartCache;
 import eu.endermite.togglepvp.util.Listener;
 import eu.endermite.togglepvp.util.DatabaseSQLite;
 import lombok.Getter;
+import org.bstats.bukkit.Metrics;
+import org.bstats.charts.CustomChart;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.reflections.Reflections;
@@ -19,8 +21,9 @@ public final class TogglePvp extends JavaPlugin {
 
     @Getter private static TogglePvp plugin;
     private ConfigCache configCache;
-    private PlayerManager playerManager;
+    protected PlayerManager playerManager;
-    private DatabaseSQLite sqLite;
+    protected DatabaseSQLite sqLite;
+    protected SmartCache smartCache;
 
     @Override
     public void onEnable() {
@@ -33,10 +36,11 @@ public final class TogglePvp extends JavaPlugin {
             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 = new SmartCache();
-        SmartCache.runSmartCache();
+        smartCache.runSmartCache();
 
         // Register listeners
         Reflections reflections = new Reflections(new String[]{"eu.endermite.togglepvp"});
@@ -55,6 +59,9 @@ public final class TogglePvp extends JavaPlugin {
         // Register command
         Objects.requireNonNull(getCommand("pvp")).setExecutor(new MainCommand());
         Objects.requireNonNull(getCommand("pvp")).setTabCompleter(new MainCommand());
+
+        Metrics metrics = new Metrics(this, 10597);
+
     }
 
     public void reloadPluginConfig() {
@@ -80,4 +87,7 @@ public final class TogglePvp extends JavaPlugin {
 
     public DatabaseSQLite getSqLite() {return sqLite;}
 
+    public SmartCache getSmartCache() {
+        return smartCache;
+    }
 }

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/api/TogglePvpAPI.java

@@ -0,0 +1,105 @@
+package eu.endermite.togglepvp.api;
+
+import eu.endermite.togglepvp.TogglePvp;
+import eu.endermite.togglepvp.util.CombatTimer;
+import org.bukkit.entity.Player;
+import java.util.UUID;
+
+public class TogglePvpAPI {
+
+    /**
+     * 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) {
+        TogglePvp.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) {
+        TogglePvp.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 TogglePvp.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 TogglePvp.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  TogglePvp.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 TogglePvp.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 TogglePvp.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 TogglePvp.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/eu/endermite/togglepvp/commands/HelpCommand.java

@@ -4,7 +4,6 @@ import eu.endermite.togglepvp.TogglePvp;
 import eu.endermite.togglepvp.util.PluginMessages;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
-
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -2,14 +2,30 @@ package eu.endermite.togglepvp.commands;
 
 import eu.endermite.togglepvp.TogglePvp;
 import eu.endermite.togglepvp.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", "togglepvp.command");
+        subCommands.put("toggle", "togglepvp.command.toggle");
+        subCommands.put("on", "togglepvp.command.toggle");
+        subCommands.put("enable", "togglepvp.command.toggle");
+        subCommands.put("off", "togglepvp.command.toggle");
+        subCommands.put("disable", "togglepvp.command.toggle");
+        subCommands.put("reload", "togglepvp.command.reload");
+    }
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (sender.hasPermission("togglepvp.command")) {
@@ -48,39 +64,29 @@ public class MainCommand implements TabExecutor {
     @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) {
+            String arg1 = args[0].toLowerCase();
-                if (noPermCmd.startsWith(arg1))
+            for (Map.Entry<String, String> entry : subCommands.entrySet()) {
-                    commands.add(noPermCmd);
+                if (entry.getKey().toLowerCase().startsWith(arg1) && sender.hasPermission(entry.getValue()))
+                    commands.add(entry.getKey());
             }
-            if (sender.hasPermission("togglepvp.command.toggle")) {
+            return commands;
-                for (String togglePermCmd : togglePerm) {
+        } else if (args.length == 2 && sender.hasPermission("togglepvp.command.toggle")) {
-                    if (togglePermCmd.startsWith(arg1))
+            switch (args[0].toLowerCase()) {
-                        commands.add(togglePermCmd);
+                default:
-                }
+                    break;
-            }
+                case "toggle":
-            if (sender.hasPermission("togglepvp.command.reload")) {
+                case "on":
-                for (String reloadPermCmd : reloadPerm) {
+                case "enable":
-                    if (reloadPermCmd.startsWith(arg1))
+                case "off":
-                        commands.add(reloadPermCmd);
+                case "disable":
-                }
+                    for (Player player : Bukkit.getOnlinePlayers()) {
+                        commands.add(player.getName());
+                    }
+                    break;
             }
+            return commands;
         }
-        return commands;
+        return null;
     }
 }

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

@@ -3,10 +3,8 @@ 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.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -17,9 +15,8 @@ public class PvpToggleCommand {
         Bukkit.getScheduler().runTaskAsynchronously(TogglePvp.getPlugin(), () -> {
 
             if (!sender.hasPermission("togglepvp.command.toggle")) {
-                String message = TogglePvp.getPlugin().getConfigCache().getNo_permission();
+                String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission());
-                BaseComponent[] component = TextComponent.fromLegacyText(message);
+                sender.sendMessage(message);
-                sender.spigot().sendMessage(component);
                 return;
             }
 
@@ -40,16 +37,14 @@ public class PvpToggleCommand {
                     } else {
                         message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_disabled());
                     }
-                    BaseComponent[] component = TextComponent.fromLegacyText(message);
+                    player.sendMessage(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();
+                    String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission());
-                    BaseComponent[] component = TextComponent.fromLegacyText(message);
+                    sender.sendMessage(message);
-                    sender.spigot().sendMessage(component);
                     return;
                 }
 
@@ -86,9 +81,8 @@ public class PvpToggleCommand {
 
     public static void enable(CommandSender sender, String[] args) {
         if (!sender.hasPermission("togglepvp.command.toggle")) {
-            String message = TogglePvp.getPlugin().getConfigCache().getNo_permission();
+            String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission());
-            BaseComponent[] component = TextComponent.fromLegacyText(message);
+            sender.sendMessage(message);
-            sender.spigot().sendMessage(component);
             return;
         }
         if (args.length == 1) {
@@ -100,16 +94,14 @@ public class PvpToggleCommand {
                 }
                 TogglePvp.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), true);
                 String message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_enabled());
-                BaseComponent[] component = TextComponent.fromLegacyText(message);
+                player.sendMessage(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();
+                String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission());
-                BaseComponent[] component = TextComponent.fromLegacyText(message);
+                sender.sendMessage(message);
-                sender.spigot().sendMessage(component);
                 return;
             }
             if (sender instanceof Player) {
@@ -138,9 +130,8 @@ public class PvpToggleCommand {
 
     public static void disable(CommandSender sender, String[] args) {
         if (!sender.hasPermission("togglepvp.command.toggle")) {
-            String message = TogglePvp.getPlugin().getConfigCache().getNo_permission();
+            String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission());
-            BaseComponent[] component = TextComponent.fromLegacyText(message);
+            sender.sendMessage(message);
-            sender.spigot().sendMessage(component);
             return;
         }
         if (args.length == 1) {
@@ -152,16 +143,14 @@ public class PvpToggleCommand {
                 }
                 TogglePvp.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), false);
                 String message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_disabled());
-                BaseComponent[] component = TextComponent.fromLegacyText(message);
+                player.sendMessage(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.sendMessage(message);
-                sender.spigot().sendMessage(component);
                 return;
             }
             if (sender instanceof Player) {

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

@@ -1,9 +1,8 @@
 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.ChatColor;
 import org.bukkit.command.CommandSender;
 
 public class ReloadCommand {
@@ -12,9 +11,8 @@ public class ReloadCommand {
 
         Bukkit.getScheduler().runTaskAsynchronously(TogglePvp.getPlugin(), () -> {
             if (!sender.hasPermission("togglepvp.command.reload")) {
-                String message = TogglePvp.getPlugin().getConfigCache().getNo_permission();
+                String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission());
-                BaseComponent[] component = TextComponent.fromLegacyText(message);
+                sender.sendMessage(message);
-                sender.spigot().sendMessage(component);
                 return;
             }
             TogglePvp.getPlugin().reloadPluginConfig(sender);

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

@@ -1,37 +1,74 @@
 package eu.endermite.togglepvp.config;
 
 import eu.endermite.togglepvp.TogglePvp;
+import io.github.thatsmusic99.configurationmaster.CMFile;
 import lombok.Getter;
-import org.bukkit.configuration.Configuration;
+import org.bukkit.configuration.file.FileConfiguration;
 
 public class ConfigCache {
 
-    @Getter private final boolean pvp_enabled_by_default;
+    private final TogglePvp plugin = TogglePvp.getPlugin();
-    @Getter private final boolean lava_and_fire_stopper_enabled;
+
-    @Getter private final String pvp_enabled;
+    @Getter private final boolean pvp_enabled_by_default, lava_and_fire_stopper_enabled, channeling_enchant_disabled,
-    @Getter private final String pvp_disabled;
+            punish_for_combat_logout, punish_for_combat_logout_announce, only_owner_can_interact_with_pet;
-    @Getter private final String cannot_attack_victim;
+    @Getter private final String pvp_enabled, pvp_disabled, cannot_attack_victim, cannot_attack_attacker,
-    @Getter private final String cannot_attack_attacker;
+            cannot_attack_pets_victim, cannot_attack_pets_attacker, no_permission, no_such_command, pvp_enabled_other,
-    @Getter private final String cannot_attack_pets_victim;
+            pvp_disabled_other, punish_for_combat_logout_message, entering_combat, leaving_combat,
-    @Getter private final String cannot_attack_pets_attacker;
+            cant_do_that_during_combat;
-    @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, combat_time, login_protection_time, teleport_protection_time;
-    @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();
+        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.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.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);
@@ -45,9 +82,12 @@ public class ConfigCache {
         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.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!");
@@ -63,5 +103,8 @@ public class ConfigCache {
         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/pets/PetHitByExplosionListener.java

@@ -0,0 +1,44 @@
+package eu.endermite.togglepvp.listeners.pets;
+
+import eu.endermite.togglepvp.TogglePvp;
+import eu.endermite.togglepvp.util.CombatTimer;
+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;
+
+@eu.endermite.togglepvp.util.Listener
+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 == damager)
+                return;
+
+            if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
+                event.setCancelled(true);
+        } catch (NullPointerException | IndexOutOfBoundsException ignored) {}
+
+    }
+}

src/main/java/eu/endermite/togglepvp/listeners/pets/PetHitByFireworkListener.java

@@ -0,0 +1,37 @@
+package eu.endermite.togglepvp.listeners.pets;
+
+import eu.endermite.togglepvp.TogglePvp;
+import eu.endermite.togglepvp.util.CombatTimer;
+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;
+
+@eu.endermite.togglepvp.util.Listener
+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 == damager)
+                return;
+
+            if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
+                event.setCancelled(true);
+
+        }
+    }
+}

src/main/java/eu/endermite/togglepvp/listeners/pets/PetHitBySplashPotionListener.java

@@ -1,28 +1,26 @@
-package eu.endermite.togglepvp.listeners.wolf;
+package eu.endermite.togglepvp.listeners.pets;
 
 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.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;
 
 @eu.endermite.togglepvp.util.Listener
-public class WolfHitBySplashPotionListener implements Listener {
+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 onWolfHitBySplashPotion(org.bukkit.event.entity.PotionSplashEvent event) {
+    public void onPetHitBySplashPotion(org.bukkit.event.entity.PotionSplashEvent event) {
 
         if (!(event.getEntity().getShooter() instanceof Player))
             return;
@@ -45,26 +43,22 @@ public class WolfHitBySplashPotionListener implements Listener {
         if (!harmful)
             return;
         for (Entity entity : event.getAffectedEntities()) {
-            if (entity instanceof Wolf) {
+            if (entity instanceof Tameable) {
-                Player damager = (Player) event.getEntity().getShooter();
+                UUID damager = ((Player) event.getEntity().getShooter()).getUniqueId();
-                Wolf victim = (Wolf) entity;
+                Tameable tameable = (Tameable) entity;
-                if (victim.getOwner() == null || victim.getOwner() == damager)
+
+                if (tameable.getOwner() == null)
                     continue;
 
-                ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+                UUID victim = tameable.getOwner().getUniqueId();
-                boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
+
-                if (!damagerPvpEnabled) {
+                if (victim == damager)
-                    event.setIntensity(victim, 0);
+                    return;
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
+
-                    continue;
+                if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
-                }
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
-                boolean victimPvpEnabled = (boolean) SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
+                else
-                if (!victimPvpEnabled) {
+                    event.setCancelled(true);
-                    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/pets/PetLeashListener.java

@@ -0,0 +1,33 @@
+package eu.endermite.togglepvp.listeners.pets;
+
+import eu.endermite.togglepvp.TogglePvp;
+import eu.endermite.togglepvp.util.CombatTimer;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import java.util.UUID;
+
+@eu.endermite.togglepvp.util.Listener
+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 (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
+                event.setCancelled(true);
+        }
+    }
+
+}

src/main/java/eu/endermite/togglepvp/listeners/pets/PetTargettingPetListener.java

@@ -0,0 +1,36 @@
+package eu.endermite.togglepvp.listeners.pets;
+
+import eu.endermite.togglepvp.TogglePvp;
+import eu.endermite.togglepvp.players.SmartCache;
+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;
+
+@eu.endermite.togglepvp.util.Listener
+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 = TogglePvp.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/eu/endermite/togglepvp/listeners/pets/PetTargettingPlayerListener.java

@@ -0,0 +1,37 @@
+package eu.endermite.togglepvp.listeners.pets;
+
+import eu.endermite.togglepvp.TogglePvp;
+import eu.endermite.togglepvp.util.CombatTimer;
+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;
+
+@eu.endermite.togglepvp.util.Listener
+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 (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
+                event.setCancelled(true);
+        }
+    }
+}

src/main/java/eu/endermite/togglepvp/listeners/pets/PlayerAttackPetListener.java

@@ -0,0 +1,50 @@
+package eu.endermite.togglepvp.listeners.pets;
+
+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.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import java.util.UUID;
+
+@eu.endermite.togglepvp.util.Listener
+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 = TogglePvp.getPlugin().getSmartCache();
+            Tameable tameable = (Tameable) event.getEntity();
+            if (tameable.getOwner() == null)
+                return;
+
+            UUID damager = event.getDamager().getUniqueId();
+            UUID victim = tameable.getOwner().getUniqueId();
+
+            if (damager == victim)
+                return;
+
+            ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+            boolean damagerPvpState = TogglePvp.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/eu/endermite/togglepvp/listeners/pets/PlayerHitPetWithProjectile.java

@@ -0,0 +1,58 @@
+package eu.endermite.togglepvp.listeners.pets;
+
+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.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import java.util.UUID;
+
+@eu.endermite.togglepvp.util.Listener
+public class PlayerHitPetWithProjectile 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 == victim)
+                return;
+
+            ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+            SmartCache smartCache = TogglePvp.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/eu/endermite/togglepvp/listeners/pets/PlayerInteractWithPetListener.java

@@ -0,0 +1,31 @@
+package eu.endermite.togglepvp.listeners.pets;
+
+import eu.endermite.togglepvp.TogglePvp;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+@eu.endermite.togglepvp.util.Listener
+public class PlayerInteractWithPetListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerInteractWithPet(org.bukkit.event.player.PlayerInteractEntityEvent event) {
+
+        if (!TogglePvp.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/eu/endermite/togglepvp/listeners/player/PetAttackPlayerListener.java

@@ -0,0 +1,48 @@
+package eu.endermite.togglepvp.listeners.player;
+
+import eu.endermite.togglepvp.TogglePvp;
+import eu.endermite.togglepvp.players.PlayerManager;
+import eu.endermite.togglepvp.util.CombatTimer;
+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;
+
+@eu.endermite.togglepvp.util.Listener
+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 = TogglePvp.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/eu/endermite/togglepvp/listeners/player/PlayerAttackListener.java

@@ -1,14 +1,13 @@
 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 java.util.UUID;
 
 @eu.endermite.togglepvp.util.Listener
 public class PlayerAttackListener implements Listener {
@@ -22,25 +21,13 @@ public class PlayerAttackListener implements Listener {
         Entity victimEntity = event.getEntity();
 
         if (damagerEntity instanceof Player && victimEntity instanceof Player) {
-            Player damager = (Player) damagerEntity;
+            UUID damager = damagerEntity.getUniqueId();
-            Player victim = (Player) victimEntity;
+            UUID victim = victimEntity.getUniqueId();
 
-            ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+            if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
-
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
-            boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
+            else
-            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/PlayerHitByExplosionListener.java

@@ -1,11 +1,12 @@
 package eu.endermite.togglepvp.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.EnderCrystal;
-import org.bukkit.entity.*;
+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;
@@ -26,26 +27,18 @@ public class PlayerHitByExplosionListener implements Listener {
             if (!event.getCause().equals(EntityDamageEvent.DamageCause.ENTITY_EXPLOSION)) {
                 return;
             }
-            Player victim = (Player) event.getEntity();
+            UUID victim = event.getEntity().getUniqueId();
             try {
-                UUID damageruuid = UUID.fromString(event.getDamager().getMetadata("PLAYEREXPLODED").get(0).asString());
+                UUID damager = UUID.fromString(event.getDamager().getMetadata("PLAYEREXPLODED").get(0).asString());
-                if (!victim.getUniqueId().equals(damageruuid)) {
+                if (victim.equals(damager))
-                    ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+                    return;
-                    boolean damagerPvpEnabled = SmartCache.getPlayerData(damageruuid).isPvpEnabled();
+
-                    if (!damagerPvpEnabled) {
+                if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
-                        PluginMessages.sendActionBar(damageruuid, config.getCannot_attack_attacker());
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
-                        event.setCancelled(true);
+                else
-                        return;
+                    event.setCancelled(true);
-                    }
+
-                    boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
+            } catch (NullPointerException | IndexOutOfBoundsException ignored) { }
-                    if (!victimPvpEnabled) {
-                        PluginMessages.sendActionBar(damageruuid, config.getCannot_attack_victim());
-                        event.setCancelled(true);
-                        return;
-                    }
-                    CombatTimer.refreshPlayersCombatTime(damageruuid, victim.getUniqueId());
-                }
-            } catch (NullPointerException | IndexOutOfBoundsException ignored) {}
         }
     }
 
@@ -78,13 +71,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(TogglePvp.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));
+                    tntPrimed.setMetadata("PLAYEREXPLODED", new FixedMetadataValue(TogglePvp.getPlugin(), damagerUuid));
-                }catch (NullPointerException ignored) {}
+                } catch (NullPointerException ignored) {
+                }
             }
         }
     }
@@ -97,7 +91,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(TogglePvp.getPlugin(), event.getPlayer().getUniqueId().toString()));
             }
         }
     }
@@ -109,7 +103,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(TogglePvp.getPlugin(), damager.getUniqueId().toString()));
         }
     }
 

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

@@ -2,12 +2,12 @@ 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;
+import java.util.UUID;
 
 @eu.endermite.togglepvp.util.Listener
 public class PlayerHitByFireworkListener implements Listener {
@@ -15,26 +15,18 @@ 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();
+            UUID victim = event.getEntity().getUniqueId();
             Firework firework = (Firework) event.getDamager();
             if (firework.getShooter() instanceof Player) {
-                Player damager = (Player) firework.getShooter();
+                UUID damager = ((Player) firework.getShooter()).getUniqueId();
                 if (damager == victim) {
                     return;
                 }
-                boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
+
-                if (!damagerPvpEnabled) {
+                if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
+                else
                     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,14 +1,13 @@
 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;
+import java.util.UUID;
 
 @eu.endermite.togglepvp.util.Listener
 public class PlayerHitByProjectileListener implements Listener {
@@ -22,27 +21,17 @@ public class PlayerHitByProjectileListener implements Listener {
         if (event.getEntity() instanceof Player && event.getDamager() instanceof Projectile) {
             Projectile projectile = (Projectile) event.getDamager();
             if (projectile.getShooter() instanceof Player) {
-                Player damager = (Player) projectile.getShooter();
+                UUID damager = ((Player) projectile.getShooter()).getUniqueId();
-                Player victim = (Player) event.getEntity();
+                UUID victim = event.getEntity().getUniqueId();
 
                 // Ender pearls and other self-damage
-                if (damager == victim) {
+                if (damager == victim)
                     return;
-                }
+
-                ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+                if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
-                boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
-                boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
+                else
-                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,20 +1,36 @@
 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.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 org.bukkit.potion.PotionEffectType;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
 @eu.endermite.togglepvp.util.Listener
 public class PlayerHitBySplashPotionListener implements Listener {
 
+    private final List<PotionEffectType> harmfulPotions = new ArrayList<>();
+
+    public PlayerHitBySplashPotionListener() {
+        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);
+    }
+
     /**
      * If thrown potion is applies negative effects and it's thrown by a player it will ahve no effect on player with pvp off
      */
@@ -27,41 +43,25 @@ public class PlayerHitBySplashPotionListener implements Listener {
         boolean harmful = false;
 
         for (PotionEffect effect : event.getPotion().getEffects()) {
-            if (effect.getType().equals(PotionEffectType.BLINDNESS) ||
+            if (harmfulPotions.contains(effect.getType())) {
-                    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;
+                    break;
             }
         }
         if (!harmful)
             return;
         for (Entity entity : event.getAffectedEntities()) {
             if (entity instanceof Player) {
-                Player damager = (Player) event.getEntity().getShooter();
+                UUID damager = ((Player) event.getEntity().getShooter()).getUniqueId();
-                Player victim = (Player) entity;
+                UUID victim = entity.getUniqueId();
                 if (damager == victim)
                     continue;
 
-                ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+                if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true)) {
-                boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
-                if (!damagerPvpEnabled) {
+                } else {
-                    event.setIntensity(victim, 0);
+                    event.setIntensity((LivingEntity) entity, 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

@@ -2,10 +2,12 @@ package eu.endermite.togglepvp.listeners.player;
 
 import eu.endermite.togglepvp.TogglePvp;
 import eu.endermite.togglepvp.players.PlayerData;
+import eu.endermite.togglepvp.players.SmartCache;
 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
@@ -16,28 +18,35 @@ public class PlayerJoinAndLeaveListener implements Listener {
     @EventHandler(ignoreCancelled = true)
     public void onPlayerJoin(org.bukkit.event.player.PlayerJoinEvent event) {
         Player player = event.getPlayer();
-
+        SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
-        PlayerData playerData = TogglePvp.getPlugin().getSqLite().getPlayerInfo(player.getUniqueId());
+        PlayerData playerData = smartCache.getPlayerData(player.getUniqueId());
-        TogglePvp.getPlugin().getPlayerManager().addPlayer(player.getUniqueId(), playerData);
+        playerData.setLoginTimestamp(Instant.now().getEpochSecond());
     }
+
     /**
-     * This event is here to dump player's saved options from memory
+     * 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();
         TogglePvp.getPlugin().getSqLite().updatePlayerInfo(player.getUniqueId(), TogglePvp.getPlugin().getPlayerManager().getPlayer(player.getUniqueId()));
-        if (TogglePvp.getPlugin().getConfigCache().isPunish_for_combat_logout()) {
+        if (!TogglePvp.getPlugin().getConfigCache().isPunish_for_combat_logout())
-            long now = Instant.now().getEpochSecond();
+            return;
-            long combatTime = TogglePvp.getPlugin().getPlayerManager().getPlayer(player.getUniqueId()).getCombattime();
+
-            if (combatTime > now) {
+        SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
-                player.setHealth(0);
+        long now = Instant.now().getEpochSecond();
-                if (TogglePvp.getPlugin().getConfigCache().isPunish_for_combat_logout_announce()) {
+        long combatTime = smartCache.getPlayerData(player.getUniqueId()).getCombattime();
-                    PluginMessages.broadcastMessage(player, TogglePvp.getPlugin().getConfigCache().getPunish_for_combat_logout_message());
+
-                }
+        if (combatTime <= now)
-                TogglePvp.getPlugin().getPlayerManager().getPlayer(player.getUniqueId()).setCombattime(now-1);
+            return;
-            }
+
-        }
+        player.setHealth(0);
+        if (TogglePvp.getPlugin().getConfigCache().isPunish_for_combat_logout_announce())
+            PluginMessages.broadcastMessage(player, TogglePvp.getPlugin().getConfigCache().getPunish_for_combat_logout_message());
+
+        PlayerData playerData = TogglePvp.getPlugin().getPlayerManager().getPlayer(player.getUniqueId());
+        playerData.setCombattime(now - 1);
+
     }
 }

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

@@ -0,0 +1,23 @@
+package eu.endermite.togglepvp.listeners.player;
+
+import eu.endermite.togglepvp.TogglePvp;
+import eu.endermite.togglepvp.players.PlayerData;
+import eu.endermite.togglepvp.players.SmartCache;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import java.time.Instant;
+
+@eu.endermite.togglepvp.util.Listener
+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 = TogglePvp.getPlugin().getSmartCache();
+        PlayerData playerData = smartCache.getPlayerData(player.getUniqueId());
+        playerData.setTeleportTimestamp(Instant.now().getEpochSecond());
+    }
+
+}

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,18 +1,17 @@
 package eu.endermite.togglepvp.listeners.unspecific;
 
 import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
+import eu.endermite.togglepvp.players.PlayerManager;
-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.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;
 
 @eu.endermite.togglepvp.util.Listener
 public class AreaEffectCloudApplyListener implements Listener {
@@ -36,49 +35,37 @@ public class AreaEffectCloudApplyListener implements Listener {
                     potionEffectType.equals(PotionEffectType.SLOW) ||
                     potionEffectType.equals(PotionEffectType.WITHER)) {
 
+                PlayerManager playerManager = TogglePvp.getPlugin().getPlayerManager();
+
                 Iterator<LivingEntity> it = event.getAffectedEntities().iterator();
-                Player damager = (Player) event.getEntity().getSource();
+                UUID damager = ((Player) event.getEntity().getSource()).getUniqueId();
                 while(it.hasNext()) {
                     LivingEntity entity = it.next();
                     if(entity instanceof Player) {
 
-                        Player victim = (Player) entity;
+                        UUID victim = entity.getUniqueId();
                         if (damager == victim)
                             continue;
 
-                        ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+                        if (playerManager.canDamage(damager, victim, true))
-                        boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
+                            CombatTimer.refreshPlayersCombatTime(damager, victim);
-                        if (!damagerPvpEnabled) {
+                        else
                             it.remove();
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
+
+                    } else if (entity instanceof Tameable) {
+                        Tameable tameable = (Tameable) entity;
+
+                        if (tameable.getOwner() == null)
                             continue;
-                        }
+
-                        boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
+                        UUID victim = tameable.getOwner().getUniqueId();
-                        if (!victimPvpEnabled) {
+                        if (victim == damager)
+                            continue;
+
+                        if (playerManager.canDamage(damager, victim, true, false))
+                            CombatTimer.refreshPlayersCombatTime(damager, victim);
+                        else
                             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/EntityHitByLightningListener.java

@@ -1,15 +1,15 @@
 package eu.endermite.togglepvp.listeners.unspecific;
 
 import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.players.SmartCache;
 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.
@@ -25,15 +25,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();
+                UUID victim = event.getEntity().getUniqueId();
-                boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
+
-                if (!victimPvpEnabled) {
+                if (TogglePvp.getPlugin().getPlayerManager().hasLoginProtection(victim)) {
+                    event.setCancelled(true);
+                    return;
+                }
+
+                if (!TogglePvp.getPlugin().getSmartCache().getPlayerData(victim).isPvpEnabled()) {
                     event.setCancelled(true);
                 }
-            } else if (event.getEntity() instanceof Wolf) {
+            } else if (event.getEntity() instanceof Tameable) {
-                Wolf victim = (Wolf) event.getEntity();
+                Tameable victim = (Tameable) event.getEntity();
-                boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
+                if (victim.getOwner() != null && !TogglePvp.getPlugin().getSmartCache().getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled()) {
-                if (!victimPvpEnabled) {
                     event.setCancelled(true);
                 }
             }

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

@@ -1,64 +1,47 @@
 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.entity.Tameable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import java.util.UUID;
 
 @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();
+            UUID damager = event.getPlayer().getUniqueId();
-            Player victim = (Player) event.getCaught();
+            UUID victim = event.getCaught().getUniqueId();
-            if (damager == victim) {
+            if (damager == victim)
                 return;
-            }
+
-            boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
+            if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
-            if (!damagerPvpEnabled) {
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
                 event.setCancelled(true);
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
+        } else if (event.getCaught() instanceof Tameable) {
+            Tameable tameable = (Tameable) event.getCaught();
+            UUID damager = event.getPlayer().getUniqueId();
+            if (tameable.getOwner() == null)
                 return;
-            }
+
-            boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
+            UUID victim = tameable.getOwner().getUniqueId();
-            if (!victimPvpEnabled) {
+
+            if (damager == victim)
+                return;
+
+            if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
                 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

@@ -2,78 +2,73 @@ 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.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;
+
 
 @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())
+        ConfigCache config = TogglePvp.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();
-            Player damager = event.getPlayer();
+            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) {
-                    Player victim = (Player) entity;
+                    UUID victim = entity.getUniqueId();
                     if (victim != damager) {
-                        boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
+                        if (TogglePvp.getPlugin().getPlayerManager().hasLoginProtection(victim, damager)) {
-                        if (!damagerPvpEnabled) {
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
                             event.setCancelled(true);
                             return;
                         }
-                        boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
+
-                        if (!victimPvpEnabled) {
+                        if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
+                            CombatTimer.refreshPlayersCombatTime(damager, victim);
+                        else
                             event.setCancelled(true);
-                            return;
+
-                        }
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
                     }
-                } else if (entity instanceof Wolf) {
+                } else if (entity instanceof Tameable) {
-                    Wolf victim = (Wolf) entity;
+                    Tameable tameable = (Tameable) entity;
-                    if (victim.getOwner() == null) {
+                    if (tameable.getOwner() == null) {
                         return;
                     }
-                    boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
+
-                    if (!damagerPvpEnabled) {
+                    UUID victim = tameable.getOwner().getUniqueId();
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
+                    if (TogglePvp.getPlugin().getPlayerManager().hasLoginProtection(victim, damager)) {
                         event.setCancelled(true);
                         return;
                     }
-                    try {
+
-                        boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
+                    if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
-                        if (!victimPvpEnabled) {
+                        CombatTimer.refreshPlayersCombatTime(damager, victim);
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
+                    else
-                            event.setCancelled(true);
+                        event.setCancelled(true);
-                            return;
+
-                        }
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
-                    } catch (NullPointerException ignored) {}
                 }
             }
         }
@@ -85,54 +80,45 @@ public class LavaDumpAndIgniteListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onIgnite(org.bukkit.event.block.BlockIgniteEvent event) {
 
-        if (!TogglePvp.getPlugin().getConfigCache().isLava_and_fire_stopper_enabled())
+        ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+
+        if (!config.isLava_and_fire_stopper_enabled())
             return;
 
-        if (event.getPlayer() !=null) {
+        if (event.getPlayer() == null)
-            Location location = event.getBlock().getLocation();
+            return;
-            Player damager = event.getPlayer();
+
-            double radius = config.getLava_and_fire_stopper_radius();
+        Location location = event.getBlock().getLocation();
-            BoundingBox boundingBox = BoundingBoxUtil.getBoundingBox(location, radius);
+        UUID damager = event.getPlayer().getUniqueId();
-            for (Entity entity : location.getWorld().getNearbyEntities(boundingBox)) {
+        double radius = config.getLava_and_fire_stopper_radius();
-                if (entity instanceof Player) {
+        BoundingBox boundingBox = BoundingBoxUtil.getBoundingBox(location, radius);
-                    Player victim = (Player) entity;
+        for (Entity entity : location.getWorld().getNearbyEntities(boundingBox)) {
-                    if (victim != damager) {
+            if (entity instanceof Player) {
-                        boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
+                UUID victim = entity.getUniqueId();
-                        if (!damagerPvpEnabled) {
+                if (victim == damager)
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
+                    continue;
-                            event.setCancelled(true);
+
-                            return;
+                if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
-                        }
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
-                        boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
+                else
-                        if (!victimPvpEnabled) {
+                    event.setCancelled(true);
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
+
-                            event.setCancelled(true);
+            } else if (entity instanceof Tameable) {
-                            return;
+                Tameable tameable = (Tameable) entity;
-                        }
+                if (tameable.getOwner() == null) {
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
+                    continue;
-                    }
-                } 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) {}
                 }
+
+                UUID victim = tameable.getOwner().getUniqueId();
+                if (victim == damager)
+                    continue;
+
+                if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
+                else
+                    event.setCancelled(true);
             }
         }
+
     }
 }

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

@@ -1,11 +1,7 @@
 package eu.endermite.togglepvp.listeners.unspecific;
 
 import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.players.SmartCache;
+import org.bukkit.entity.*;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LightningStrike;
-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;
@@ -25,16 +21,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 (TogglePvp.getPlugin().getPlayerManager().hasLoginProtection(victim.getUniqueId())) {
                         event.setCancelled(true);
                         return;
                     }
-                } else if (entity instanceof Wolf) {
+
-                    Wolf victim = (Wolf) entity;
+                    if (!TogglePvp.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 (!TogglePvp.getPlugin().getSmartCache().getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled()) {
                         event.setCancelled(true);
                         return;
                     }

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

@@ -2,72 +2,60 @@ 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.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;
+
 @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())
+
+        ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+
+        if (!config.isLava_and_fire_stopper_enabled())
             return;
 
-        if(event.getBlock().getType().equals(Material.WITHER_ROSE)) {
+        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();
+                    UUID damager = event.getPlayer().getUniqueId();
-                    Player victim = (Player) entity;
+                    UUID victim = entity.getUniqueId();
-                    if (victim != damager) {
+                    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 (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
-                    if (!damagerPvpEnabled) {
+                        CombatTimer.refreshPlayersCombatTime(damager, victim);
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
+                    else
                         event.setCancelled(true);
+                } else if (entity instanceof Tameable) {
+                    Tameable tameable = (Tameable) entity;
+                    UUID damager = event.getPlayer().getUniqueId();
+                    if (tameable.getOwner() == null)
                         return;
-                    }
+
-                    boolean victimPvpEnabled = SmartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled();
+                    UUID victim = tameable.getOwner().getUniqueId();
-                    if (!victimPvpEnabled) {
+                    if (victim == damager)
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
+                        return;
+
+                    if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                        CombatTimer.refreshPlayersCombatTime(damager, victim);
+                    else
                         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/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

@@ -8,10 +8,15 @@ public class PlayerData {
 
     private long cachetime, combattime;
     private boolean pvpEnabled;
+    private boolean lastCombatCheck;
+    private long loginTimestamp;
+    private long teleportTimestamp;
 
     public PlayerData(boolean pvpEnabled) {
         this.pvpEnabled = pvpEnabled;
         this.combattime = Instant.now().getEpochSecond()-1;
+        this.loginTimestamp = Instant.now().getEpochSecond()-1;
+        this.teleportTimestamp = Instant.now().getEpochSecond()-1;
         refreshCachetime();
     }
 
@@ -42,4 +47,28 @@ public class PlayerData {
     public void refreshCombatTime() {
         this.combattime = Instant.now().getEpochSecond()+ TogglePvp.getPlugin().getConfigCache().getCombat_time();
     }
+
+    public boolean getLastCombatCheck() {
+        return lastCombatCheck;
+    }
+
+    public void setLastCombatCheck(boolean bool) {
+        lastCombatCheck = bool;
+    }
+
+    public void setLoginTimestamp(long loginTimestamp) {
+        this.loginTimestamp = loginTimestamp + TogglePvp.getPlugin().getConfigCache().getLogin_protection_time();
+    }
+
+    public long getLoginTimestamp() {
+        return loginTimestamp;
+    }
+
+    public void setTeleportTimestamp(long teleportTimestamp) {
+        this.teleportTimestamp = teleportTimestamp + TogglePvp.getPlugin().getConfigCache().getTeleport_protection_time();
+    }
+
+    public long getTeleportTimestamp() {
+        return teleportTimestamp;
+    }
 }

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

@@ -1,21 +1,44 @@
 package eu.endermite.togglepvp.players;
 
 import eu.endermite.togglepvp.TogglePvp;
+import eu.endermite.togglepvp.config.ConfigCache;
+import eu.endermite.togglepvp.util.CombatTimer;
+import eu.endermite.togglepvp.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.Map;
 import java.util.UUID;
 
 public class PlayerManager {
 
-    @Getter HashMap<UUID, PlayerData> playerList = new HashMap<>();
+    @Getter
+    HashMap<UUID, PlayerData> playerList = new HashMap<>();
+
+    public final BukkitTask combatTrackerTask;
 
     public PlayerManager() {
         for (Player p : Bukkit.getOnlinePlayers()) {
             PlayerData playerData = TogglePvp.getPlugin().getSqLite().getPlayerInfo(p.getUniqueId());
             playerList.put(p.getUniqueId(), playerData);
         }
+
+        combatTrackerTask = Bukkit.getScheduler().runTaskTimerAsynchronously(TogglePvp.getPlugin(), () -> {
+            for (Map.Entry<UUID, PlayerData> set : playerList.entrySet()) {
+                UUID uuid = set.getKey();
+                if (!CombatTimer.isInCombat(uuid)) {
+                    if (set.getValue().getLastCombatCheck()) {
+                        set.getValue().setLastCombatCheck(false);
+                        PluginMessages.sendActionBar(uuid, TogglePvp.getPlugin().getConfigCache().getLeaving_combat());
+                    }
+                } else {
+                    set.getValue().setLastCombatCheck(true);
+                }
+            }
+        }, 20, 20);
     }
 
     public void refreshPlayersCacheTime(UUID uuid) {
@@ -25,7 +48,8 @@ public class PlayerManager {
     public void refreshPlayersCombatTime(UUID uuid) {
         try {
             playerList.get(uuid).refreshCombatTime();
-        } catch (Exception ignored) {}
+        } catch (Exception ignored) {
+        }
     }
 
     public PlayerData getPlayer(UUID uuid) {
@@ -36,26 +60,75 @@ public class PlayerManager {
         playerList.put(uuid, data);
     }
 
-    public void removePlayer(UUID uuid) {
-        playerList.remove(uuid);
-    }
-
     public boolean getPlayerPvPState(UUID uuid) {
-        return playerList.get(uuid).isPvpEnabled();
+        return TogglePvp.getPlugin().getSmartCache().getPlayerData(uuid).isPvpEnabled();
     }
 
     public void setPlayerPvpState(UUID uuid, boolean state) {
-        playerList.get(uuid).setPvpEnabled(state);
+        TogglePvp.getPlugin().getSmartCache().getPlayerData(uuid).setPvpEnabled(state);
     }
 
     public boolean togglePlayerPvpState(UUID uuid) {
-        boolean currentState = playerList.get(uuid).isPvpEnabled();
+        SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
-        if (currentState) {
+        if (smartCache.getPlayerData(uuid).isPvpEnabled()) {
-            playerList.get(uuid).setPvpEnabled(false);
+            smartCache.getPlayerData(uuid).setPvpEnabled(false);
             return false;
         } else {
-            playerList.get(uuid).setPvpEnabled(true);
+            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 = TogglePvp.getPlugin().getSmartCache();
+
+        if (!smartCache.getPlayerData(attacker).isPvpEnabled()) {
+            if (sendDenyMessage) {
+                ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+                PluginMessages.sendActionBar(attacker, config.getCannot_attack_attacker());
+            }
+            return false;
+        }
+        if (!smartCache.getPlayerData(victim).isPvpEnabled()) {
+            if (sendDenyMessage) {
+                ConfigCache config = TogglePvp.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 = TogglePvp.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 = TogglePvp.getPlugin().getSmartCache();
+        return Instant.now().getEpochSecond() < smartCache.getPlayerData(uuid).getTeleportTimestamp();
+    }
+
 }

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

@@ -9,7 +9,7 @@ import java.util.UUID;
 
 public class SmartCache {
 
-    public static void runSmartCache() {
+    public 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()) {
@@ -29,7 +29,7 @@ public class SmartCache {
         }, 100, 100);
     }
 
-    public static PlayerData getPlayerData(UUID uuid) {
+    public PlayerData getPlayerData(UUID uuid) {
         // Try to get data from cache and refresh it
         try {
             TogglePvp.getPlugin().getPlayerManager().refreshPlayersCacheTime(uuid);
@@ -47,7 +47,7 @@ public class SmartCache {
         }
     }
 
-    public static void setPlayerPvpState(UUID uuid, boolean state) {
+    public 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);

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

@@ -1,7 +1,6 @@
 package eu.endermite.togglepvp.util;
 
 import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.players.SmartCache;
 import java.time.Instant;
 import java.util.UUID;
 
@@ -10,7 +9,7 @@ public class CombatTimer {
     public static void refreshPlayersCombatTime(UUID uuid) {
         try {
             long now = Instant.now().getEpochSecond();
-            long combattime = SmartCache.getPlayerData(uuid).getCombattime();
+            long combattime = TogglePvp.getPlugin().getSmartCache().getPlayerData(uuid).getCombattime();
             if (combattime < now) {
                 PluginMessages.sendActionBar(uuid, TogglePvp.getPlugin().getConfigCache().getEntering_combat());
             }
@@ -25,7 +24,7 @@ public class CombatTimer {
 
     public static boolean isInCombat(UUID uuid) {
         try {
-            long combattimer = SmartCache.getPlayerData(uuid).getCombattime();
+            long combattimer = TogglePvp.getPlugin().getPlayerManager().getPlayer(uuid).getCombattime();
             long now = Instant.now().getEpochSecond();
             return combattimer > now;
         } catch (Exception e) {

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

@@ -41,16 +41,12 @@ public class DatabaseSQLite {
         try {
             conn = DriverManager.getConnection(url);
             System.out.println("Connection to SQLite has been established.");
+            if (conn != null) {
+                conn.close();
+                return true;
+            }
         } catch (SQLException e) {
             System.out.println(e.getMessage());
-        } finally {
-            try {
-                if (conn != null) {
-                    conn.close();
-                }
-            } catch (SQLException ex) {
-                System.out.println(ex.getMessage());
-            }
         }
         return false;
     }
@@ -72,8 +68,9 @@ public class DatabaseSQLite {
             String sql = "SELECT * FROM `players` WHERE `player_uuid` = '" + uuid.toString() + "';";
             statement.execute(sql);
             ResultSet result = statement.getResultSet();
+            boolean state = result.getBoolean("pvpenabled");
             conn.close();
-            return new PlayerData(result.getBoolean("pvpenabled"));
+            return new PlayerData(state);
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }

src/main/resources/config.yml

@@ -11,9 +11,20 @@ settings:
   # 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
 
+  # Makes it so only pet owner can interact with it.
+  # Useful if you don't want people renaming other people's pets.
+  only_owner_can_interact_with_pet: false
+
   # Time (in seconds) to keep player in combat
   combat_time: 25
 
+  # Time (in seconds) that player can't be harmed by other player after logging in
+  login_protection_time: 0
+
+  # Time (in seconds) that player can't be harmed by other player after teleporting
+  teleport_protection_time: 0
+
+
   # Kill the player if they log out during combat
   punish_for_combat_logout:
     enabled: true

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: TogglePvP
 version: ${project.version}
-main: eu.endermite.togglepvp.TogglePvP
+main: eu.endermite.togglepvp.TogglePvp
 authors: [YouHaveTrouble]
 api-version: 1.13
 description: PvP toggle plugin