fix config

.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.2</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,6 +73,10 @@
             <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>
@@ -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>

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

@@ -7,21 +7,22 @@ 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.bukkit.command.CommandSender;
+import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.reflections.Reflections;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
-import java.util.Objects;
 import java.util.Set;
 
 public final class TogglePvp extends JavaPlugin {
 
     @Getter private static TogglePvp plugin;
     private ConfigCache configCache;
-    private PlayerManager playerManager;
+    protected PlayerManager playerManager;
-    private DatabaseSQLite sqLite;
+    protected DatabaseSQLite sqLite;
-    private SmartCache smartCache;
+    protected SmartCache smartCache;
 
     @Override
     public void onEnable() {
@@ -55,13 +56,20 @@ public final class TogglePvp extends JavaPlugin {
         });
 
         // Register command
-        Objects.requireNonNull(getCommand("pvp")).setExecutor(new MainCommand());
+        PluginCommand pvpCommand = getCommand("pvp");
-        Objects.requireNonNull(getCommand("pvp")).setTabCompleter(new MainCommand());
+        if (pvpCommand == null) {
+            getLogger().severe("Error with registering commands.");
+            getLogger().severe("Plugin will now disable.");
+            getServer().getPluginManager().disablePlugin(this);
+        }
+        MainCommand mainCommand = new MainCommand();
+        pvpCommand.setExecutor(mainCommand);
+        pvpCommand.setTabCompleter(mainCommand);
+
+        Metrics metrics = new Metrics(this, 10597);
     }
 
     public void reloadPluginConfig() {
-        saveDefaultConfig();
-        reloadConfig();
         configCache = new ConfigCache();
     }
 

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

@@ -1,26 +0,0 @@
-package eu.endermite.togglepvp;
-
-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) {
-        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 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();
-    }
-
-
-}

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

@@ -0,0 +1,123 @@
+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 teleport protection.
+     * @param player Player to check
+     * @return True if player has teleport protection, false if not
+     */
+    public static boolean hasTeleportProtection(Player player) {
+        return TogglePvp.getPlugin().getPlayerManager().hasLoginProtection(player.getUniqueId());
+    }
+
+    /**
+     * Checks if player has teleport protection.
+     * @param uuid UUID of player to check
+     * @return True if player has teleport protection, false if not
+     */
+    public static boolean hasTeleportProtection(UUID uuid) {
+        return 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/api/event/PlayerEnterCombatEvent.java

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

src/main/java/eu/endermite/togglepvp/api/event/PlayerLeaveCombatEvent.java

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

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

@@ -1,38 +1,79 @@
 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;
+            snowballs_knockback, egg_knockback;
-    @Getter private final String cannot_attack_attacker;
+    @Getter private final String pvp_enabled, pvp_disabled, cannot_attack_victim, cannot_attack_attacker,
-    @Getter private final String cannot_attack_pets_victim;
+            cannot_attack_pets_victim, cannot_attack_pets_attacker, no_permission, no_such_command, pvp_enabled_other,
-    @Getter private final String cannot_attack_pets_attacker;
+            pvp_disabled_other, punish_for_combat_logout_message, entering_combat, leaving_combat,
-    @Getter private final String no_permission;
+            cant_do_that_during_combat;
-    @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;
-    @Getter final boolean only_owner_can_interact_with_pet;
 
     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.snowballs_do_knockback", false, "Set to true if snowballs should cause knockback to players");
+
+                addDefault("settings.eggs_do_knockback", false, "Set to true if eggs should cause knockback to players");
+
+                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);
@@ -47,8 +88,15 @@ public class ConfigCache {
         this.punish_for_combat_logout_announce = config.getBoolean("settings.punish_for_combat_logout.announce", true);
         this.punish_for_combat_logout_message = config.getString("settings.punish_for_combat_logout.message", "&f%player% logged out while in combat. What a loser.");
         this.only_owner_can_interact_with_pet = config.getBoolean("settings.only_owner_can_interact_with_pet", false);
+
+        this.snowballs_knockback = config.getBoolean("settings.snowballs_do_knockback", false);
+        this.egg_knockback = config.getBoolean("settings.eggs_do_knockback", false);
+
         this.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 +111,9 @@ public class ConfigCache {
         this.entering_combat = config.getString("messages.entering_combat", "&cEntering combat");
         this.leaving_combat = config.getString("messages.leaving_combat", "&cLeaving combat");
         this.cant_do_that_during_combat = config.getString("messages.cant_do_that_during_combat", "&cYou can't do that while in combat!");
+
+
     }
+
+
 }

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

@@ -1,10 +1,7 @@
 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.Tameable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -19,35 +16,28 @@ 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 onPlayerHitByExplosion(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+    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 victim = (Tameable) event.getEntity();
+        Tameable tameable = (Tameable) event.getEntity();
-        if (victim.getOwner() == null)
+        if (tameable.getOwner() == null)
             return;
 
+        UUID victim = tameable.getOwner().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.getOwner().getUniqueId() == damageruuid) {
+            if (victim == damager)
                 return;
-            }
+
-            ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+            if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
-            SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
-            if (!smartCache.getPlayerData(damageruuid).isPvpEnabled()) {
+            else
-                PluginMessages.sendActionBar(damageruuid, config.getCannot_attack_pets_attacker());
                 event.setCancelled(true);
-                return;
-            }
-            if (!smartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled()) {
-                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/pets/PetHitByFireworkListener.java

@@ -1,43 +1,36 @@
 package eu.endermite.togglepvp.listeners.pets;
 
 import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.players.SmartCache;
 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.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 onFireworkDamage(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+    public void onPetFireworkDamage(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
         if (event.getDamager() instanceof Firework && event.getEntity() instanceof Tameable) {
-            Tameable victim = (Tameable) event.getEntity();
+            Tameable tameable = (Tameable) event.getEntity();
-            if (victim.getOwner() == null)
+            if (tameable.getOwner() == null)
                 return;
             Firework firework = (Firework) event.getDamager();
             if (!(firework.getShooter() instanceof Player))
                 return;
-            Player damager = (Player) firework.getShooter();
+            UUID damager = ((Player) firework.getShooter()).getUniqueId();
-            if (victim.getOwner() == damager)
+            UUID victim = tameable.getOwner().getUniqueId();
+            if (victim == damager)
                 return;
-            SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
+
-            if (!smartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled()) {
+            if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
                 event.setCancelled(true);
-                PluginMessages.sendActionBar(damager.getUniqueId(), TogglePvp.getPlugin().getConfigCache().getCannot_attack_pets_attacker());
-                return;
-            }
-            if (!smartCache.getPlayerData(victim.getUniqueId()).isPvpEnabled()) {
-                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/pets/PetHitBySplashPotionListener.java

@@ -1,10 +1,7 @@
 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.Tameable;
@@ -13,6 +10,7 @@ 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 PetHitBySplashPotionListener implements Listener {
@@ -22,7 +20,7 @@ public class PetHitBySplashPotionListener implements Listener {
      * 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;
@@ -46,25 +44,21 @@ public class PetHitBySplashPotionListener implements Listener {
             return;
         for (Entity entity : event.getAffectedEntities()) {
             if (entity instanceof Tameable) {
-                Player damager = (Player) event.getEntity().getShooter();
+                UUID damager = ((Player) event.getEntity().getShooter()).getUniqueId();
-                Tameable victim = (Tameable) 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();
-                SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
 
-                if (!TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId())) {
+                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);
-                if (!smartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled()) {
+                else
-                    event.setIntensity(victim, 0);
+                    event.setCancelled(true);
-                    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

@@ -1,14 +1,12 @@
 package eu.endermite.togglepvp.listeners.pets;
 
 import eu.endermite.togglepvp.TogglePvp;
-import eu.endermite.togglepvp.config.ConfigCache;
+import eu.endermite.togglepvp.util.CombatTimer;
-import eu.endermite.togglepvp.players.SmartCache;
-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 PetLeashListener implements Listener {
@@ -16,25 +14,19 @@ 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 victim = (Tameable) event.getEntity();
+            Tameable tameable = (Tameable) event.getEntity();
-            if (victim.getOwner() == null)
+            if (tameable.getOwner() == null)
                 return;
 
-            Player damager = event.getPlayer();
+            UUID damager = event.getPlayer().getUniqueId();
-            if (victim.getOwner() == damager)
+            UUID victim = tameable.getOwner().getUniqueId();
+            if (victim == damager)
                 return;
 
-            ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+            if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
-            SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
-            if (!smartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled()) {
+            else
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
                 event.setCancelled(true);
-                return;
-            }
-            if (!smartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled()) {
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
-                event.setCancelled(true);
-            }
         }
     }
 

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

@@ -20,9 +20,9 @@ public class PetTargettingPetListener implements Listener {
                 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;

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

@@ -1,19 +1,22 @@
 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 onWolfTarget(org.bukkit.event.entity.EntityTargetEvent event) {
+    public void onPetTargetPlayer(org.bukkit.event.entity.EntityTargetEvent event) {
         if (!(event.getEntity() instanceof Tameable))
             return;
 
@@ -22,12 +25,13 @@ public class PetTargettingPlayerListener implements Listener {
             return;
 
         if (event.getTarget() instanceof Player) {
-            boolean attackerPvPEnabled = TogglePvp.getPlugin().getSmartCache().getPlayerData(entity.getOwner().getUniqueId()).isPvpEnabled();
+            UUID damager = entity.getOwner().getUniqueId();
-            Player victim = (Player) event.getTarget();
+            UUID victim = event.getTarget().getUniqueId();
-            boolean victimPvpEnabled = TogglePvp.getPlugin().getSmartCache().getPlayerData(victim.getUniqueId()).isPvpEnabled();
+
-            if (!attackerPvPEnabled || !victimPvpEnabled) {
+            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

@@ -11,11 +11,13 @@ 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 onPlayerAttacktameable(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+    public void onPlayerAttackPet(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
 
         if (event.getDamager() instanceof Player && event.getEntity() instanceof Tameable) {
             SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
@@ -23,25 +25,25 @@ public class PlayerAttackPetListener implements Listener {
             if (tameable.getOwner() == null)
                 return;
 
-            Player damager = (Player) event.getDamager();
+            UUID damager = event.getDamager().getUniqueId();
+            UUID victim = tameable.getOwner().getUniqueId();
 
-            if (damager.getUniqueId() == tameable.getOwner().getUniqueId())
+            if (damager == victim)
                 return;
 
             ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-            boolean damagerPvpState = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
+            boolean damagerPvpState = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager);
-
             if (!damagerPvpState) {
                 PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
                 event.setCancelled(true);
                 return;
             }
-            if (!smartCache.getPlayerData(tameable.getOwner().getUniqueId()).isPvpEnabled()) {
+            if (!smartCache.getPlayerData(victim).isPvpEnabled()) {
                 PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
                 event.setCancelled(true);
                 return;
             }
-            CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), tameable.getOwner().getUniqueId());
+            CombatTimer.refreshPlayersCombatTime(damager);
 
         }
     }

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

@@ -12,6 +12,8 @@ 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 {
 
@@ -19,30 +21,37 @@ 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 onPlayerHitWolfWithProjectile(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+    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 victim = (Tameable) event.getEntity();
+            Tameable tameable = (Tameable) event.getEntity();
-            Player damager = (Player) projectile.getShooter();
+
-            if (victim.getOwner() == null || victim.getOwner() == damager)
+            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.getUniqueId()).isPvpEnabled()) {
+
-                event.setCancelled(true);
+            if (!smartCache.getPlayerData(damager).isPvpEnabled()) {
                 PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
-                return;
-            }
-            if (!smartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled()) {
                 event.setCancelled(true);
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
                 return;
             }
-            CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
+            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/player/PetAttackPlayerListener.java

@@ -1,6 +1,7 @@
 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;
@@ -8,6 +9,7 @@ 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 {
@@ -17,17 +19,20 @@ public class PetAttackPlayerListener implements Listener {
      * This is to fix any inconsistancy with pet behavior
      */
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onWolfAttack(org.bukkit.event.entity.EntityDamageByEntityEvent event) {
+    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) {
 
-            boolean damagerPvpEnabled = TogglePvp.getPlugin().getSmartCache().getPlayerData(entity.getOwner().getUniqueId()).isPvpEnabled();
+            UUID victim = event.getEntity().getUniqueId();
-            Player victim = (Player) event.getEntity();
+            UUID damager = entity.getOwner().getUniqueId();
-            boolean victimPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId());
+
-            if (!victimPvpEnabled || !damagerPvpEnabled) {
+            PlayerManager playerManager = TogglePvp.getPlugin().getPlayerManager();
+
+            if (!playerManager.canDamage(damager, victim, false)) {
                 if (entity instanceof Wolf) {
                     Wolf wolf = (Wolf) entity;
                     wolf.setAngry(false);
@@ -35,7 +40,7 @@ public class PetAttackPlayerListener implements Listener {
                 event.setCancelled(true);
                 return;
             }
-            CombatTimer.refreshPlayersCombatTime(entity.getOwner().getUniqueId(), victim.getUniqueId());
+            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/PlayerDeathListener.java

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

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

@@ -1,9 +1,7 @@
 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.EnderCrystal;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
@@ -29,27 +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))
                     return;
 
-                ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+                if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
-                if (!TogglePvp.getPlugin().getSmartCache().getPlayerData(damageruuid).isPvpEnabled()) {
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
-                    PluginMessages.sendActionBar(damageruuid, config.getCannot_attack_attacker());
+                else
                     event.setCancelled(true);
-                    return;
-                }
-                if (!TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(victim.getUniqueId())) {
-                    PluginMessages.sendActionBar(damageruuid, config.getCannot_attack_victim());
-                    event.setCancelled(true);
-                    return;
-                }
-                CombatTimer.refreshPlayersCombatTime(damageruuid, victim.getUniqueId());
 
-            } catch (NullPointerException | IndexOutOfBoundsException ignored) {
+            } catch (NullPointerException | IndexOutOfBoundsException ignored) { }
-            }
         }
     }
 

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,12 @@
 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.*;
-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 +20,39 @@ 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();
+
+                if (TogglePvp.getPlugin().getConfigCache().isSnowballs_knockback() && event.getDamager() instanceof Snowball) {
+                    if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true)) {
+                        ((Player) event.getEntity()).damage(0.01, (Entity) projectile.getShooter());
+                        CombatTimer.refreshPlayersCombatTime(damager, victim);
+                    } else {
+                        event.setCancelled(true);
+                        return;
+                    }
+
+                } else if (TogglePvp.getPlugin().getConfigCache().isEgg_knockback() && event.getDamager() instanceof Egg) {
+                    if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true)) {
+                        ((Player) event.getEntity()).damage(0.01, (Entity) projectile.getShooter());
+                        CombatTimer.refreshPlayersCombatTime(damager, victim);
+                    } else {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
 
                 // Ender pearls and other self-damage
-                if (damager == victim) {
+                if (damager == victim)
                     return;
-                }
+
-                ConfigCache config = TogglePvp.getPlugin().getConfigCache();
+                if (event.getDamage() == 0)
-                boolean damagerPvpEnabled = TogglePvp.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId());
+                    return;
-                boolean victimPvpEnabled = 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, 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,29 +18,32 @@ 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());
-
+        playerData.setLoginTimestamp(Instant.now().getEpochSecond());
-        TogglePvp.getPlugin().getPlayerManager().addPlayer(player.getUniqueId(), playerData);
     }
+
     /**
-     * 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);
+        PlayerData playerData = smartCache.getPlayerData(player.getUniqueId());
-                if (TogglePvp.getPlugin().getConfigCache().isPunish_for_combat_logout_announce()) {
+
-                    PluginMessages.broadcastMessage(player, TogglePvp.getPlugin().getConfigCache().getPunish_for_combat_logout_message());
+        if (!playerData.isInCombat())
-                }
+            return;
-                TogglePvp.getPlugin().getPlayerManager().getPlayer(player.getUniqueId()).setCombattime(now-1);
+
-            }
+        player.setHealth(0);
-        }
+        if (TogglePvp.getPlugin().getConfigCache().isPunish_for_combat_logout_announce())
+            PluginMessages.broadcastMessage(player, TogglePvp.getPlugin().getConfigCache().getPunish_for_combat_logout_message());
+
+
     }
 }

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/unspecific/AreaEffectCloudApplyListener.java

@@ -1,10 +1,8 @@
 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.Tameable;
@@ -13,6 +11,7 @@ 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,47 +35,37 @@ public class AreaEffectCloudApplyListener implements Listener {
                     potionEffectType.equals(PotionEffectType.SLOW) ||
                     potionEffectType.equals(PotionEffectType.WITHER)) {
 
-                SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
+                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))
-                        if (!smartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled()) {
+                            CombatTimer.refreshPlayersCombatTime(damager, victim);
+                        else
                             it.remove();
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
+
-                            continue;
-                        }
-                        if (!smartCache.getPlayerData(victim.getUniqueId()).isPvpEnabled()) {
-                            it.remove();
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                            continue;
-                        }
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
                     } else if (entity instanceof Tameable) {
-                        Tameable victim = (Tameable) entity;
+                        Tameable tameable = (Tameable) entity;
-                        if (victim.getOwner() == null || victim.getOwner() == damager) {
+
-                            return;
+                        if (tameable.getOwner() == null)
-                        }
-                        ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-                        if (!smartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled()) {
-                            it.remove();
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
                             continue;
-                        }
+
-                        if (!smartCache.getPlayerData(victim.getUniqueId()).isPvpEnabled()) {
+                        UUID victim = tameable.getOwner().getUniqueId();
-                            it.remove();
+                        if (victim == damager)
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
                             continue;
-                        }
+
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
+                        if (playerManager.canDamage(damager, victim, true, false))
+                            CombatTimer.refreshPlayersCombatTime(damager, victim);
+                        else
+                            it.remove();
                     }
                 }
             }

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

@@ -9,6 +9,7 @@ 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.
@@ -24,8 +25,14 @@ 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();
-                if (!TogglePvp.getPlugin().getSmartCache().getPlayerData(victim.getUniqueId()).isPvpEnabled()) {
+
+                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 Tameable) {

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

@@ -1,62 +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.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;
-            }
+
-            SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
+            if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
-            if (!smartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled()) {
+                CombatTimer.refreshPlayersCombatTime(damager, victim);
+            else
                 event.setCancelled(true);
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
-                return;
-            }
-            if (!smartCache.getPlayerData(victim.getUniqueId()).isPvpEnabled()) {
-                event.setCancelled(true);
-                PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                return;
-            }
-            CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
         } else if (event.getCaught() instanceof Tameable) {
-            Tameable victim = (Tameable) event.getCaught();
+            Tameable tameable = (Tameable) event.getCaught();
-            Player damager = event.getPlayer();
+            UUID damager = event.getPlayer().getUniqueId();
-            if (victim.getOwner() == null || victim.getOwner() == damager) {
+            if (tameable.getOwner() == null)
                 return;
-            }
+
-            SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
+            UUID victim = tameable.getOwner().getUniqueId();
-            if (!smartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled()) {
+
+            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_attacker());
-                return;
-            }
-            if (!smartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled()) {
-                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,10 +2,8 @@ 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;
@@ -16,61 +14,60 @@ 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();
-            SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
+
             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) {
-                        if (!smartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled()) {
+                        if (TogglePvp.getPlugin().getPlayerManager().hasLoginProtection(victim, damager)) {
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
                             event.setCancelled(true);
                             return;
                         }
-                        if (!smartCache.getPlayerData(victim.getUniqueId()).isPvpEnabled()) {
+
-                            PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
+                        if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
+                            CombatTimer.refreshPlayersCombatTime(damager, victim);
+                        else
                             event.setCancelled(true);
-                            return;
+
-                        }
-                        CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
                     }
                 } else if (entity instanceof Tameable) {
-                    Tameable victim = (Tameable) entity;
+                    Tameable tameable = (Tameable) entity;
-                    if (victim.getOwner() == null) {
+                    if (tameable.getOwner() == null) {
                         return;
                     }
-                    if (!smartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled()) {
+
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
+                    UUID victim = tameable.getOwner().getUniqueId();
+                    if (TogglePvp.getPlugin().getPlayerManager().hasLoginProtection(victim, damager)) {
                         event.setCancelled(true);
                         return;
                     }
 
-                    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);
-                        return;
-                    }
-                    CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
 
                 }
             }
@@ -83,49 +80,43 @@ 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)
             return;
 
         Location location = event.getBlock().getLocation();
-        Player damager = event.getPlayer();
+        UUID damager = event.getPlayer().getUniqueId();
         double radius = config.getLava_and_fire_stopper_radius();
         BoundingBox boundingBox = BoundingBoxUtil.getBoundingBox(location, radius);
-        SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
         for (Entity entity : location.getWorld().getNearbyEntities(boundingBox)) {
             if (entity instanceof Player) {
-                Player victim = (Player) entity;
+                UUID victim = entity.getUniqueId();
-                if (victim != damager) {
+                if (victim == damager)
-                    if (!smartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled()) {
+                    continue;
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
+
-                        event.setCancelled(true);
+                if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
-                        return;
+                    CombatTimer.refreshPlayersCombatTime(damager, victim);
-                    }
+                else
-                    if (!smartCache.getPlayerData(victim.getUniqueId()).isPvpEnabled()) {
+                    event.setCancelled(true);
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
+
-                        event.setCancelled(true);
-                        return;
-                    }
-                    CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
-                }
             } else if (entity instanceof Tameable) {
-                Tameable victim = (Tameable) entity;
+                Tameable tameable = (Tameable) entity;
-                if (victim.getOwner() == null || victim.getOwner() == damager) {
+                if (tameable.getOwner() == null) {
-                    return;
+                    continue;
                 }
-                if (!smartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled()) {
+
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
+                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);
-                    return;
-                }
-                if (!smartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled()) {
-                    PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
-                    event.setCancelled(true);
-                    return;
-                }
-                CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
             }
         }
 

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

@@ -21,6 +21,12 @@ 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().hasLoginProtection(victim.getUniqueId())) {
+                        event.setCancelled(true);
+                        return;
+                    }
+
                     if (!TogglePvp.getPlugin().getSmartCache().getPlayerData(victim.getUniqueId()).isPvpEnabled()) {
                         event.setCancelled(true);
                         return;

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

@@ -2,10 +2,8 @@ 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;
@@ -16,6 +14,8 @@ 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 {
 
@@ -23,7 +23,6 @@ public class PlaceWitherRoseListener implements Listener {
     public void onPlayerWitherRosePlace(org.bukkit.event.block.BlockPlaceEvent event) {
 
         ConfigCache config = TogglePvp.getPlugin().getConfigCache();
-        SmartCache smartCache = TogglePvp.getPlugin().getSmartCache();
 
         if (!config.isLava_and_fire_stopper_enabled())
             return;
@@ -34,38 +33,29 @@ public class PlaceWitherRoseListener implements Listener {
             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)
                         return;
-                    if (!smartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled()) {
+
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_attacker());
+                    if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true))
+                        CombatTimer.refreshPlayersCombatTime(damager, victim);
+                    else
                         event.setCancelled(true);
-                        return;
-                    }
-                    if (!smartCache.getPlayerData(victim.getUniqueId()).isPvpEnabled()) {
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_victim());
-                        event.setCancelled(true);
-                        return;
-                    }
-                    CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getUniqueId());
                 } else if (entity instanceof Tameable) {
-                    Tameable victim = (Tameable) entity;
+                    Tameable tameable = (Tameable) entity;
-                    Player damager = event.getPlayer();
+                    UUID damager = event.getPlayer().getUniqueId();
-                    if (victim.getOwner() == null || victim.getOwner() == damager) {
+                    if (tameable.getOwner() == null)
                         return;
-                    }
+
-                    if (!smartCache.getPlayerData(damager.getUniqueId()).isPvpEnabled()) {
+                    UUID victim = tameable.getOwner().getUniqueId();
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker());
+                    if (victim == damager)
+                        return;
+
+                    if (TogglePvp.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
+                        CombatTimer.refreshPlayersCombatTime(damager, victim);
+                    else
                         event.setCancelled(true);
-                        return;
-                    }
-                    if (!smartCache.getPlayerData(victim.getOwner().getUniqueId()).isPvpEnabled()) {
-                        PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim());
-                        event.setCancelled(true);
-                        return;
-                    }
-                    CombatTimer.refreshPlayersCombatTime(damager.getUniqueId(), victim.getOwner().getUniqueId());
                 }
             }
         }

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

@@ -6,14 +6,15 @@ import java.time.Instant;
 
 public class PlayerData {
 
-    private long cachetime, combattime;
+    private long cachetime, combattime, loginTimestamp, teleportTimestamp;
-    private boolean pvpEnabled;
+    private boolean pvpEnabled, lastCombatCheck, inCombat;
-    private boolean lastCombatCheck;
 
     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;
+        this.inCombat = false;
         refreshCachetime();
     }
 
@@ -52,4 +53,28 @@ public class PlayerData {
     public void setLastCombatCheck(boolean bool) {
         lastCombatCheck = bool;
     }
+
+    public void setLoginTimestamp(long loginTimestamp) {
+        this.loginTimestamp = loginTimestamp + TogglePvp.getPlugin().getConfigCache().getLogin_protection_time()-1;
+    }
+
+    public long getLoginTimestamp() {
+        return loginTimestamp;
+    }
+
+    public void setTeleportTimestamp(long teleportTimestamp) {
+        this.teleportTimestamp = teleportTimestamp + TogglePvp.getPlugin().getConfigCache().getTeleport_protection_time()-1;
+    }
+
+    public long getTeleportTimestamp() {
+        return teleportTimestamp;
+    }
+
+    public boolean isInCombat() {
+        return inCombat;
+    }
+
+    public void setInCombat(boolean inCombat) {
+        this.inCombat = inCombat;
+    }
 }

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

@@ -1,14 +1,17 @@
 package eu.endermite.togglepvp.players;
 
 import eu.endermite.togglepvp.TogglePvp;
+import eu.endermite.togglepvp.api.event.PlayerLeaveCombatEvent;
+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 {
@@ -24,19 +27,29 @@ public class PlayerManager {
             playerList.put(p.getUniqueId(), playerData);
         }
 
-        combatTrackerTask = Bukkit.getScheduler().runTaskTimerAsynchronously(TogglePvp.getPlugin(), () -> {
+        combatTrackerTask = Bukkit.getScheduler().runTaskTimerAsynchronously(TogglePvp.getPlugin(), () -> playerList.forEach(((uuid, playerData) -> {
-            for (Map.Entry<UUID, PlayerData> set : playerList.entrySet()) {
+            if (!CombatTimer.isInCombat(uuid)) {
-                UUID uuid = set.getKey();
+                if (playerData.getLastCombatCheck()) {
-                if (!CombatTimer.isInCombat(uuid)) {
+                    Player player = Bukkit.getPlayer(uuid);
-                    if (set.getValue().getLastCombatCheck()) {
+                    if (player == null)
-                        set.getValue().setLastCombatCheck(false);
+                        return;
+                    PlayerLeaveCombatEvent playerLeaveCombatEvent = new PlayerLeaveCombatEvent(player);
+                    Bukkit.getScheduler().runTask(TogglePvp.getPlugin(), () -> {
+                        Bukkit.getPluginManager().callEvent(playerLeaveCombatEvent);
+                        if (playerLeaveCombatEvent.isCancelled()) {
+                            playerData.refreshCombatTime();
+                            return;
+                        }
+                        playerData.setLastCombatCheck(false);
+                        playerData.setInCombat(false);
                         PluginMessages.sendActionBar(uuid, TogglePvp.getPlugin().getConfigCache().getLeaving_combat());
-                    }
+                    });
-                } else {
-                    set.getValue().setLastCombatCheck(true);
                 }
+            } else {
+                playerData.setLastCombatCheck(true);
             }
-        }, 20, 20);
+        })), 20, 20);
+
     }
 
     public void refreshPlayersCacheTime(UUID uuid) {
@@ -45,8 +58,17 @@ public class PlayerManager {
 
     public void refreshPlayersCombatTime(UUID uuid) {
         try {
-            playerList.get(uuid).refreshCombatTime();
+            PlayerData data = playerList.get(uuid);
-        } catch (Exception ignored) { }
+            if (data == null)
+                return;
+            Player player = Bukkit.getPlayer(uuid);
+            if (player == null || player.isDead())
+                return;
+
+            data.refreshCombatTime();
+            data.setInCombat(true);
+        } catch (Exception ignored) {
+        }
     }
 
     public PlayerData getPlayer(UUID uuid) {
@@ -75,4 +97,57 @@ public class PlayerManager {
             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/util/CombatTimer.java

@@ -1,6 +1,9 @@
 package eu.endermite.togglepvp.util;
 
 import eu.endermite.togglepvp.TogglePvp;
+import eu.endermite.togglepvp.api.event.PlayerEnterCombatEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import java.time.Instant;
 import java.util.UUID;
 
@@ -10,11 +13,21 @@ public class CombatTimer {
         try {
             long now = Instant.now().getEpochSecond();
             long combattime = TogglePvp.getPlugin().getSmartCache().getPlayerData(uuid).getCombattime();
-            if (combattime < now) {
+
-                PluginMessages.sendActionBar(uuid, TogglePvp.getPlugin().getConfigCache().getEntering_combat());
+            Player player = Bukkit.getPlayer(uuid);
-            }
+            PlayerEnterCombatEvent playerEnterCombatEvent = new PlayerEnterCombatEvent(player);
-            TogglePvp.getPlugin().getPlayerManager().refreshPlayersCombatTime(uuid);
+            Bukkit.getScheduler().runTask(TogglePvp.getPlugin(), () -> {
-        } catch (Exception ignored) {}
+                Bukkit.getPluginManager().callEvent(playerEnterCombatEvent);
+                if (playerEnterCombatEvent.isCancelled())
+                    return;
+                TogglePvp.getPlugin().getPlayerManager().refreshPlayersCombatTime(uuid);
+
+                if (combattime <= now) {
+                    PluginMessages.sendActionBar(uuid, TogglePvp.getPlugin().getConfigCache().getEntering_combat());
+                }
+            });
+        } catch (Exception ignored) {
+        }
     }
 
     public static void refreshPlayersCombatTime(UUID attacker_uuid, UUID victim_uuid) {
@@ -24,9 +37,7 @@ public class CombatTimer {
 
     public static boolean isInCombat(UUID uuid) {
         try {
-            long combattimer = TogglePvp.getPlugin().getSmartCache().getPlayerData(uuid).getCombattime();
+            return TogglePvp.getPlugin().getPlayerManager().getPlayer(uuid).getCombattime() >= Instant.now().getEpochSecond();
-            long now = Instant.now().getEpochSecond();
-            return combattimer > now;
         } catch (Exception e) {
             return false;
         }

src/main/resources/config.yml

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