Skip to content

Commit bb02ee2

Browse files
NikV2NikV2
committed
Fix golden apple cooldowns
Fix combatlog
1 parent 529b13c commit bb02ee2

5 files changed

Lines changed: 7 additions & 4 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.5</version>
9+
<version>1.5.6</version>
1010
<packaging>jar</packaging>
1111

1212
<name>CombatPlus</name>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ public void onEatEnchantedGoldenApple(PlayerItemConsumeEvent e) {
5555
final UUID p = e.getPlayer().getUniqueId();
5656
final Player player = e.getPlayer();
5757
if (cooldown.containsKey(p)) {
58-
e.setCancelled(true);
5958
long secondsleft = ((cooldown.get(p) / 1000) + Config.Setting.COOLDOWN_ENCHANTED_APPLE_COOLDOWN.getInt()) - (System.currentTimeMillis() / 1000);
6059
if (secondsleft < 1) {
6160
cooldown.remove(p);
6261
return;
6362
}
63+
e.setCancelled(true);
6464
player.sendMessage(MsgType.ENCHANTED_GOLDEN_APPLE_COOLDOWN.getMessage().replaceAll("%seconds%", String.valueOf(secondsleft)));
6565
} else {
6666
cooldown.put(p, System.currentTimeMillis());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ public void onEatGoldenApple(PlayerItemConsumeEvent e) {
5555
final UUID p = e.getPlayer().getUniqueId();
5656
final Player player = e.getPlayer();
5757
if (cooldown.containsKey(p)) {
58-
e.setCancelled(true);
5958
long secondsleft = ((cooldown.get(p) / 1000) + Config.Setting.COOLDOWN_GOLDEN_APPLE_COOLDOWN.getInt()) - (System.currentTimeMillis() / 1000);
6059
if (secondsleft < 1) {
6160
cooldown.remove(p);
6261
return;
6362
}
63+
e.setCancelled(true);
6464
player.sendMessage(MsgType.GOLDEN_APPLE_COOLDOWN.getMessage().replaceAll("%seconds%", String.valueOf(secondsleft)));
6565
} else {
6666
cooldown.put(p, System.currentTimeMillis());

‎src/main/java/me/nik/combatplus/listeners/combatlog/CombatListener.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import me.nik.combatplus.files.Config;
44
import me.nik.combatplus.managers.CombatLog;
55
import org.bukkit.entity.Entity;
6+
import org.bukkit.entity.LivingEntity;
67
import org.bukkit.entity.Mob;
78
import org.bukkit.entity.Player;
89
import org.bukkit.entity.Projectile;
@@ -21,6 +22,8 @@ public void onCombat(EntityDamageByEntityEvent e) {
2122

2223
final Entity target = e.getEntity();
2324

25+
if (!(e.getEntity() instanceof LivingEntity)) return;
26+
2427
if (e.getDamager() instanceof Projectile) {
2528

2629
if (!tagForProjectiles) return;

‎version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.5
1+
1.5.6

0 commit comments

Comments
 (0)