Skip to content

Commit cca44b6

Browse files
NikV2NikV2
committed
General code cleanup
1 parent 6e85d38 commit cca44b6

4 files changed

Lines changed: 18 additions & 14 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>me.nik</groupId>
88
<artifactId>CombatPlus</artifactId>
9-
<version>1.5.7</version>
9+
<version>1.5.8</version>
1010
<packaging>jar</packaging>
1111

1212
<name>CombatPlus</name>

‎src/main/java/me/nik/combatplus/listeners/DamageModifiers.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ public class DamageModifiers implements Listener {
2525
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
2626
public void onEntityDamage(EntityDamageByEntityEvent e) {
2727
if (!(e.getDamager() instanceof Player)) return;
28-
Player player = (Player) e.getDamager();
28+
final Player player = (Player) e.getDamager();
2929
if (worldUtils.combatDisabledWorlds(player)) return;
30-
ItemStack handItem = player.getInventory().getItemInMainHand();
31-
String weapon = handItem.getType().name();
30+
final ItemStack handItem = player.getInventory().getItemInMainHand();
31+
final String weapon = handItem.getType().name();
3232
if (Config.Setting.DISABLE_SWEEP_ENABLED.getBoolean() && e.getCause().equals(EntityDamageEvent.DamageCause.ENTITY_SWEEP_ATTACK)) {
3333
disableSweep(e, player, handItem);
3434
}

‎src/main/java/me/nik/combatplus/listeners/HealthBar.java‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.bukkit.attribute.Attribute;
88
import org.bukkit.entity.LivingEntity;
99
import org.bukkit.entity.Player;
10+
import org.bukkit.entity.Projectile;
1011
import org.bukkit.event.EventHandler;
1112
import org.bukkit.event.EventPriority;
1213
import org.bukkit.event.Listener;
@@ -18,16 +19,19 @@ public class HealthBar implements Listener {
1819

1920
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
2021
public void onCombat(EntityDamageByEntityEvent e) {
21-
if (!(e.getDamager() instanceof Player)) return;
22-
23-
if (worldUtils.healthBarDisabledWorlds((Player) e.getDamager())) return;
24-
2522
if (!(e.getEntity() instanceof LivingEntity)) return;
26-
27-
Player p = (Player) e.getDamager();
28-
LivingEntity entity = (LivingEntity) e.getEntity();
29-
30-
p.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messenger.format(getHealth(entity))));
23+
final LivingEntity entity = (LivingEntity) e.getEntity();
24+
25+
if (e.getDamager() instanceof Player) {
26+
final Player p = (Player) e.getDamager();
27+
if (worldUtils.healthBarDisabledWorlds(p)) return;
28+
p.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messenger.format(getHealth(entity))));
29+
} else if (e.getDamager() instanceof Projectile) {
30+
if (!(((Projectile) e.getDamager()).getShooter() instanceof Player)) return;
31+
final Player shooter = (Player) ((Projectile) e.getDamager()).getShooter();
32+
if (worldUtils.healthBarDisabledWorlds(shooter)) return;
33+
shooter.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messenger.format(getHealth(entity))));
34+
}
3135
}
3236

3337
private String getHealth(LivingEntity entity) {

‎version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.7
1+
1.5.8

0 commit comments

Comments
 (0)