Skip to content

Commit 9a2827d

Browse files
NikV2NikV2
committed
Commit
1 parent 2739fba commit 9a2827d

2 files changed

Lines changed: 34 additions & 35 deletions

File tree

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

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -51,43 +51,42 @@ public void run() {
5151

5252
@EventHandler(ignoreCancelled = true)
5353
public void onLaunch(ProjectileLaunchEvent e) {
54-
if (worldUtils.enderpearlDisabledWorlds((Player) e.getEntity().getShooter())) return;
55-
if (e.getEntity().getType() == EntityType.ENDER_PEARL && e.getEntity().getShooter() instanceof Player) {
56-
Player player = (Player) e.getEntity().getShooter();
57-
if (player.hasPermission("cp.bypass.epearl")) return;
58-
final UUID p = player.getUniqueId();
59-
if (cooldown.containsKey(p)) {
60-
e.setCancelled(true);
61-
if (!(player.getGameMode() == GameMode.CREATIVE) && plugin.serverVersion("1.8") || plugin.serverVersion("1.9") || plugin.serverVersion("1.10")) {
62-
ItemStack enderpearl = new ItemStack(Material.ENDER_PEARL, 1);
63-
player.getInventory().addItem(enderpearl);
64-
}
65-
long secondsLeft = ((cooldown.get(p) / 1000) + cdtime) - (System.currentTimeMillis() / 1000);
66-
player.sendMessage(Messenger.message("enderpearl_cooldown").replaceAll("%seconds%", String.valueOf(secondsLeft)));
67-
} else {
68-
taskRun(p);
69-
if (MiscUtils.isPlaceholderApiEnabled()) {
70-
setupPlaceholder(p);
71-
}
72-
Messenger.debug(player, "&3Ender Pearl Cooldown &f&l>> &6Added to cooldown: &atrue");
73-
if (actionbar) {
74-
new BukkitRunnable() {
75-
76-
@Override
77-
public void run() {
78-
if (cooldown.containsKey(p)) {
79-
long secondsleft = ((cooldown.get(p) / 1000) + cdtime) - (System.currentTimeMillis() / 1000);
80-
String message = Lang.get().getString("enderpearl_cooldown_actionbar").replaceAll("%seconds%", String.valueOf(secondsleft));
81-
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messenger.format(message)));
82-
} else {
83-
cancel();
84-
}
85-
}
86-
}.runTaskTimerAsynchronously(plugin, 0, 20);
54+
if (!(e.getEntity().getShooter() instanceof Player)) return;
55+
if (!(e.getEntity().getType() == EntityType.ENDER_PEARL)) return;
56+
Player player = (Player) e.getEntity().getShooter();
57+
if (worldUtils.enderpearlDisabledWorlds(player)) return;
58+
if (player.hasPermission("cp.bypass.epearl")) return;
59+
final UUID p = player.getUniqueId();
60+
if (cooldown.containsKey(p)) {
61+
e.setCancelled(true);
62+
if (!(player.getGameMode() == GameMode.CREATIVE) && plugin.serverVersion("1.8") || plugin.serverVersion("1.9") || plugin.serverVersion("1.10")) {
63+
ItemStack enderpearl = new ItemStack(Material.ENDER_PEARL, 1);
64+
player.getInventory().addItem(enderpearl);
65+
}
66+
long secondsLeft = ((cooldown.get(p) / 1000) + cdtime) - (System.currentTimeMillis() / 1000);
67+
player.sendMessage(Messenger.message("enderpearl_cooldown").replaceAll("%seconds%", String.valueOf(secondsLeft)));
68+
} else {
69+
taskRun(p);
70+
if (MiscUtils.isPlaceholderApiEnabled()) {
71+
setupPlaceholder(p);
72+
}
73+
Messenger.debug(player, "&3Ender Pearl Cooldown &f&l>> &6Added to cooldown: &atrue");
74+
if (actionbar) {
75+
new BukkitRunnable() {
76+
@Override
77+
public void run() {
78+
if (cooldown.containsKey(p)) {
79+
long secondsleft = ((cooldown.get(p) / 1000) + cdtime) - (System.currentTimeMillis() / 1000);
80+
String message = Lang.get().getString("enderpearl_cooldown_actionbar").replaceAll("%seconds%", String.valueOf(secondsleft));
81+
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messenger.format(message)));
82+
} else {
83+
cancel();
84+
}
8785
}
88-
}
86+
}.runTaskTimerAsynchronously(plugin, 0, 20);
8987
}
9088
}
89+
}
9190

9291
private void setupPlaceholder(UUID p) {
9392

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: CombatPlus
2-
version: 1.3.4
2+
version: 1.3.5
33
main: me.nik.combatplus.CombatPlus
44
api-version: 1.13
55
authors: [Nik]

0 commit comments

Comments
 (0)