Skip to content

Commit e282c87

Browse files
NikV2NikV2
committed
Commit
1 parent bef16af commit e282c87

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class AttributesSet implements Listener {
1818
Changes the attribute of the player to the Old Attack Speed (On Join)
1919
*/
2020

21-
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
21+
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
2222
public void onJoin(PlayerJoinEvent e) {
2323
if (Config.get().getBoolean("combat.settings.old_pvp")) {
2424
final Player player = e.getPlayer();
@@ -42,7 +42,7 @@ public void onJoin(PlayerJoinEvent e) {
4242
Resets the attribute of the player to the New Attack Speed (On Leave)
4343
*/
4444

45-
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
45+
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
4646
public void onLeave(PlayerQuitEvent e) {
4747
if (Config.get().getBoolean("combat.settings.old_pvp")) {
4848
final Player player = e.getPlayer();
@@ -58,7 +58,7 @@ public void onLeave(PlayerQuitEvent e) {
5858
Changes the attribute of the player to the Old Attack Speed (On World Change)
5959
*/
6060

61-
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
61+
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
6262
public void onWorldChange(PlayerChangedWorldEvent e) {
6363
if (!Config.get().getBoolean("combat.settings.old_pvp")) return;
6464
final Player player = e.getPlayer();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class BowBoost implements Listener {
1919
This Listener prevents players hitting themselves with a bow
2020
*/
2121

22-
@EventHandler(priority = EventPriority.NORMAL)
22+
@EventHandler(priority = EventPriority.LOW)
2323
public void onArrowDamage(EntityDamageByEntityEvent e) {
2424
if (!(e.getEntity() instanceof Player)) return;
2525
if (!(e.getDamager() instanceof Arrow)) return;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void run() {
4646

4747
// This Listener adds a cooldown between eating Golden Apples
4848

49-
@EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL)
49+
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
5050
public void onEatGoldenApple(PlayerItemConsumeEvent e) {
5151
if (worldUtils.gappleDisabledWorlds(e.getPlayer())) return;
5252
if (e.getPlayer().hasPermission("cp.bypass.gapple")) return;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class ItemFrameRotate implements Listener {
1717
This Listener removes the ability to rotate item frames
1818
*/
1919

20-
@EventHandler(priority = EventPriority.NORMAL)
20+
@EventHandler(priority = EventPriority.LOWEST)
2121
public void onRotate(PlayerInteractEntityEvent e) {
2222
if (!(e.getRightClicked() instanceof ItemFrame)) return;
2323
if (e.getPlayer().hasPermission("cp.bypass.rotate")) return;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ public class Offhand implements Listener {
2525
This Listener completely disables the use of the Offhand
2626
*/
2727

28-
@EventHandler(priority = EventPriority.HIGHEST)
28+
@EventHandler(priority = EventPriority.HIGH)
2929
public void onSwapHands(PlayerSwapHandItemsEvent e) {
3030
if (worldUtils.offhandDisabledWorlds(e.getPlayer())) return;
3131
if (e.getPlayer().hasPermission("cp.bypass.offhand")) return;
3232
e.setCancelled(true);
3333
Messenger.debug(e.getPlayer(), "&3Offhand &f&l>> &6Canceled: &a" + e.isCancelled());
3434
}
3535

36-
@EventHandler(priority = EventPriority.HIGHEST)
36+
@EventHandler(priority = EventPriority.HIGH)
3737
public void onClickOffHand(InventoryClickEvent e) {
3838
if (worldUtils.offhandDisabledWorlds((Player) e.getWhoClicked())) return;
3939
if (e.getWhoClicked().hasPermission("cp.bypass.offhand")) return;
@@ -45,7 +45,7 @@ public void onClickOffHand(InventoryClickEvent e) {
4545
}
4646
}
4747

48-
@EventHandler(priority = EventPriority.HIGHEST)
48+
@EventHandler(priority = EventPriority.HIGH)
4949
public void onDrag(InventoryDragEvent e) {
5050
if (worldUtils.offhandDisabledWorlds((Player) e.getWhoClicked())) return;
5151
if (e.getWhoClicked().hasPermission("cp.bypass.offhand")) return;

‎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.2.9
2+
version: 1.3.0
33
main: me.nik.combatplus.CombatPlus
44
api-version: 1.13
55
authors: [Nik]

0 commit comments

Comments
 (0)