JavaJava19
diff --git a/‎src/main/java/me/nik/combatplus/listeners/DamageModifiers.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/me/nik/combatplus/listeners/DamageModifiers.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/me/nik/combatplus/listeners/PlayerRegen.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/me/nik/combatplus/listeners/PlayerRegen.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/resources/plugin.yml‎
Lines changed: 1 addition & 1 deletion b/‎src/main/resources/plugin.yml‎
Lines changed: 1 addition & 1 deletion
@@ -82,8 +82,8 @@ private void oldSharpDamage(EntityDamageByEntityEvent e, Entity player, ItemStac
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onEntityDamage(EntityDamageByEntityEvent e) {
         if (!(e.getDamager() instanceof Player)) return;
-        if (worldUtils.combatDisabledWorlds((Player) e.getDamager())) return;
         Player player = (Player) e.getDamager();
+        if (worldUtils.combatDisabledWorlds(player)) return;
         ItemStack handItem = player.getInventory().getItemInMainHand();
         String isWeapon = handItem.getType().name();
         if (isEnabled("combat.settings.old_weapon_damage")) {
 
@@ -37,11 +37,11 @@ public PlayerRegen(CombatPlus plugin) {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onRegen(EntityRegainHealthEvent e) {
-        if (worldUtils.combatDisabledWorlds((Player) e.getEntity())) return;
         if (e.getEntityType() != EntityType.PLAYER || e.getRegainReason() != EntityRegainHealthEvent.RegainReason.SATIATED) {
             return;
         }
         final Player p = (Player) e.getEntity();
+        if (worldUtils.combatDisabledWorlds(p)) return;
         final UUID playerID = p.getUniqueId();
         double playerHealth = p.getHealth();
         double playerSaturation = p.getSaturation();
 
@@ -1,5 +1,5 @@
 name: CombatPlus
-version: 1.2.5
+version: 1.2.6
 main: me.nik.combatplus.CombatPlus
 api-version: 1.13
 authors: [Nik]