Skip to content

Commit 658156b

Browse files
NikV2NikV2
committed
Commit
1 parent 848fb69 commit 658156b

10 files changed

Lines changed: 40 additions & 27 deletions

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
public class BowBoost implements Listener {
1414

15+
private final WorldUtils worldUtils = new WorldUtils();
16+
1517
/*
1618
Disables the ability to Boost yourself up using a Bow, By shooting yourself
1719
This Listener prevents players hitting themselves with a bow
@@ -22,7 +24,7 @@ public void onArrowDamage(EntityDamageByEntityEvent e) {
2224
if (!(e.getEntity() instanceof Player)) return;
2325
if (!(e.getDamager() instanceof Arrow)) return;
2426
Player player = (Player) e.getEntity();
25-
if (WorldUtils.combatDisabledWorlds(player)) return;
27+
if (worldUtils.combatDisabledWorlds(player)) return;
2628
if (player.hasPermission("cp.bypass.bowboost")) return;
2729
Arrow arrow = (Arrow) e.getDamager();
2830
ProjectileSource holder = arrow.getShooter();

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
public class DamageModifiers implements Listener {
1818

19+
private final WorldUtils worldUtils = new WorldUtils();
20+
1921
private final double oldPickaxeDamage = Config.get().getDouble("advanced.settings.modifiers.old_pickaxes_damage");
2022
private final double oldAxeDamage = Config.get().getDouble("advanced.settings.modifiers.old_axes_damage");
2123
private final double oldShovelDamage = Config.get().getDouble("advanced.settings.modifiers.old_shovels_damage");
@@ -80,7 +82,7 @@ private void oldSharpDamage(EntityDamageByEntityEvent e, Entity player, ItemStac
8082
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
8183
public void onEntityDamage(EntityDamageByEntityEvent e) {
8284
if (!(e.getDamager() instanceof Player)) return;
83-
if (WorldUtils.combatDisabledWorlds((Player) e.getDamager())) return;
85+
if (worldUtils.combatDisabledWorlds((Player) e.getDamager())) return;
8486
Player player = (Player) e.getDamager();
8587
ItemStack handItem = player.getInventory().getItemInMainHand();
8688
String isWeapon = handItem.getType().name();

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
public class EnchantedGoldenApple implements Listener {
2222

2323
private final CombatPlus plugin;
24+
private final WorldUtils worldUtils = new WorldUtils();
2425

2526
private final HashMap<UUID, Long> cooldown = new HashMap<>();
2627
private final int cdtime = Config.get().getInt("golden_apple_cooldown.enchanted_golden_apple.cooldown");
@@ -44,7 +45,7 @@ public void run() {
4445

4546
@EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL)
4647
public void onEatEnchantedGoldenApple(PlayerItemConsumeEvent e) {
47-
if (WorldUtils.gappleDisabledWorlds(e.getPlayer())) return;
48+
if (worldUtils.gappleDisabledWorlds(e.getPlayer())) return;
4849
if (e.getPlayer().hasPermission("cp.bypass.gapple")) return;
4950
final Material handItem = e.getItem().getType();
5051
if (handItem == Material.ENCHANTED_GOLDEN_APPLE) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
public class Enderpearl implements Listener {
2323

2424
private final CombatPlus plugin;
25+
private final WorldUtils worldUtils = new WorldUtils();
2526

2627
private final HashMap<UUID, Long> cooldown = new HashMap<>();
2728
private final int cdtime = Config.get().getInt("enderpearl_cooldown.cooldown");
@@ -49,7 +50,7 @@ private boolean holdsEnderPearl(Player p) {
4950

5051
@EventHandler(priority = EventPriority.NORMAL)
5152
public void onInteract(PlayerInteractEvent e) {
52-
if (WorldUtils.enderpearlDisabledWorlds(e.getPlayer())) return;
53+
if (worldUtils.enderpearlDisabledWorlds(e.getPlayer())) return;
5354
if (e.getAction().equals(Action.RIGHT_CLICK_AIR) || e.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
5455
Player player = e.getPlayer();
5556
if (holdsEnderPearl(player)) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
public class GoldenApple implements Listener {
2222

2323
private final CombatPlus plugin;
24+
private final WorldUtils worldUtils = new WorldUtils();
2425

2526
private final HashMap<UUID, Long> cooldown = new HashMap<>();
2627
private final int cdtime = Config.get().getInt("golden_apple_cooldown.golden_apple.cooldown");
@@ -44,7 +45,7 @@ public void run() {
4445

4546
@EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL)
4647
public void onEatGoldenApple(PlayerItemConsumeEvent e) {
47-
if (WorldUtils.gappleDisabledWorlds(e.getPlayer())) return;
48+
if (worldUtils.gappleDisabledWorlds(e.getPlayer())) return;
4849
if (e.getPlayer().hasPermission("cp.bypass.gapple")) return;
4950
final Material handItem = e.getItem().getType();
5051
if (handItem == Material.GOLDEN_APPLE) {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
public class ItemFrameRotate implements Listener {
1313

14+
private final WorldUtils worldUtils = new WorldUtils();
15+
1416
/*
1517
This Listener removes the ability to rotate item frames
1618
*/
@@ -19,7 +21,7 @@ public class ItemFrameRotate implements Listener {
1921
public void onRotate(PlayerInteractEntityEvent e) {
2022
if (!(e.getRightClicked() instanceof ItemFrame)) return;
2123
if (e.getPlayer().hasPermission("cp.bypass.rotate")) return;
22-
if (WorldUtils.itemFrameRotationDisabledWorlds(e.getPlayer())) return;
24+
if (worldUtils.itemFrameRotationDisabledWorlds(e.getPlayer())) return;
2325
if (((ItemFrame) e.getRightClicked()).getItem().getType().equals(Material.AIR)) return;
2426
e.setCancelled(true);
2527
Messenger.debug(e.getPlayer(), "&3Item Frame Rotation &f&l>> &6Canceled: &a" + e.isCancelled());

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
public class Offhand implements Listener {
1919

20+
private final WorldUtils worldUtils = new WorldUtils();
21+
2022
private static final int OFFHANDSLOT = 40;
2123

2224
/*
@@ -25,15 +27,15 @@ public class Offhand implements Listener {
2527

2628
@EventHandler(priority = EventPriority.HIGHEST)
2729
public void onSwapHands(PlayerSwapHandItemsEvent e) {
28-
if (WorldUtils.offhandDisabledWorlds(e.getPlayer())) return;
30+
if (worldUtils.offhandDisabledWorlds(e.getPlayer())) return;
2931
if (e.getPlayer().hasPermission("cp.bypass.offhand")) return;
3032
e.setCancelled(true);
3133
Messenger.debug(e.getPlayer(), "&3Offhand &f&l>> &6Canceled: &a" + e.isCancelled());
3234
}
3335

3436
@EventHandler(priority = EventPriority.HIGHEST)
3537
public void onClickOffHand(InventoryClickEvent e) {
36-
if (WorldUtils.offhandDisabledWorlds((Player) e.getWhoClicked())) return;
38+
if (worldUtils.offhandDisabledWorlds((Player) e.getWhoClicked())) return;
3739
if (e.getWhoClicked().hasPermission("cp.bypass.offhand")) return;
3840
if (e.getInventory().getType() != InventoryType.CRAFTING || e.getSlot() != OFFHANDSLOT) return;
3941
if (e.getClick().equals(ClickType.NUMBER_KEY) || itemCheck(e.getCursor())) {
@@ -45,7 +47,7 @@ public void onClickOffHand(InventoryClickEvent e) {
4547

4648
@EventHandler(priority = EventPriority.HIGHEST)
4749
public void onDrag(InventoryDragEvent e) {
48-
if (WorldUtils.offhandDisabledWorlds((Player) e.getWhoClicked())) return;
50+
if (worldUtils.offhandDisabledWorlds((Player) e.getWhoClicked())) return;
4951
if (e.getWhoClicked().hasPermission("cp.bypass.offhand")) return;
5052
if (e.getInventory().getType() != InventoryType.CRAFTING || !e.getInventorySlots().contains(OFFHANDSLOT))
5153
return;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
public class PlayerRegen implements Listener {
2121

2222
private final CombatPlus plugin;
23+
private final WorldUtils worldUtils = new WorldUtils();
2324

2425
private final Map<UUID, Long> healTimes = new HashMap<>();
2526
private final int oldRegenFrequency = Config.get().getInt("advanced.settings.old_regen.frequency");
@@ -36,7 +37,7 @@ public PlayerRegen(CombatPlus plugin) {
3637

3738
@EventHandler(priority = EventPriority.HIGHEST)
3839
public void onRegen(EntityRegainHealthEvent e) {
39-
if (WorldUtils.combatDisabledWorlds((Player) e.getEntity())) return;
40+
if (worldUtils.combatDisabledWorlds((Player) e.getEntity())) return;
4041
if (e.getEntityType() != EntityType.PLAYER || e.getRegainReason() != EntityRegainHealthEvent.RegainReason.SATIATED) {
4142
return;
4243
}

‎src/main/java/me/nik/combatplus/utils/SetAttackSpeed.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66

77
public class SetAttackSpeed {
88
private final double attackSpeed = Config.get().getDouble("advanced.settings.old_pvp.attack_speed");
9+
private final WorldUtils worldUtils = new WorldUtils();
910

1011
public void setAttackSpd(Player player) {
11-
if (WorldUtils.combatDisabledWorlds(player)) {
12+
if (worldUtils.combatDisabledWorlds(player)) {
1213
new ResetStats().resetAttackSpeed(player);
1314
return;
1415
}

‎src/main/java/me/nik/combatplus/utils/WorldUtils.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,46 @@
77

88
public class WorldUtils {
99

10-
private static final List<String> COMBATWORLDS = Config.get().getStringList("combat.settings.disabled_worlds");
11-
private static final List<String> ITEMFRAMEWORLDS = Config.get().getStringList("disable_item_frame_rotation.disabled_worlds");
12-
private static final List<String> GAPPLEWORLDS = Config.get().getStringList("golden_apple_cooldown.disabled_worlds");
13-
private static final List<String> EPEARLWORLDS = Config.get().getStringList("enderpearl_cooldown.disabled_worlds");
14-
private static final List<String> OFFHANDWORLDS = Config.get().getStringList("disable_offhand.disabled_worlds");
15-
16-
public static boolean combatDisabledWorlds(Player player) {
17-
for (String world : COMBATWORLDS) {
10+
private final List<String> combatWorlds = Config.get().getStringList("combat.settings.disabled_worlds");
11+
private final List<String> itemFrameWorlds = Config.get().getStringList("disable_item_frame_rotation.disabled_worlds");
12+
private final List<String> gappleWorlds = Config.get().getStringList("golden_apple_cooldown.disabled_worlds");
13+
private final List<String> epearlWorlds = Config.get().getStringList("enderpearl_cooldown.disabled_worlds");
14+
private final List<String> offhandWorlds = Config.get().getStringList("disable_offhand.disabled_worlds");
15+
16+
public boolean combatDisabledWorlds(Player player) {
17+
for (String world : combatWorlds) {
1818
if (player.getWorld().getName().equalsIgnoreCase(world))
1919
return true;
2020
}
2121
return false;
2222
}
2323

24-
public static boolean itemFrameRotationDisabledWorlds(Player player) {
25-
for (String world : ITEMFRAMEWORLDS) {
24+
public boolean itemFrameRotationDisabledWorlds(Player player) {
25+
for (String world : itemFrameWorlds) {
2626
if (player.getWorld().getName().equalsIgnoreCase(world))
2727
return true;
2828
}
2929
return false;
3030
}
3131

32-
public static boolean gappleDisabledWorlds(Player player) {
33-
for (String world : GAPPLEWORLDS) {
32+
public boolean gappleDisabledWorlds(Player player) {
33+
for (String world : gappleWorlds) {
3434
if (player.getWorld().getName().equalsIgnoreCase(world))
3535
return true;
3636
}
3737
return false;
3838
}
3939

40-
public static boolean enderpearlDisabledWorlds(Player player) {
41-
for (String world : EPEARLWORLDS) {
40+
public boolean enderpearlDisabledWorlds(Player player) {
41+
for (String world : epearlWorlds) {
4242
if (player.getWorld().getName().equalsIgnoreCase(world))
4343
return true;
4444
}
4545
return false;
4646
}
4747

48-
public static boolean offhandDisabledWorlds(Player player) {
49-
for (String world : OFFHANDWORLDS) {
48+
public boolean offhandDisabledWorlds(Player player) {
49+
for (String world : offhandWorlds) {
5050
if (player.getWorld().getName().equalsIgnoreCase(world))
5151
return true;
5252
}

0 commit comments

Comments
 (0)