Skip to content

Commit 2894b27

Browse files
NikV2NikV2
committed
Commit
1 parent a262cc2 commit 2894b27

9 files changed

Lines changed: 31 additions & 25 deletions

File tree

‎src/main/java/me/nik/combatplus/CombatPlus.java‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,27 @@
4242

4343
public final class CombatPlus extends JavaPlugin {
4444

45+
private SetAttackSpeed setAttackSpeed;
46+
private SetCustomHealth setCustomHealth;
47+
private ResetStats resetStats;
48+
4549
@Override
4650
public void onEnable() {
51+
//Initialize
52+
PapiHook papiHook = new PapiHook(this);
53+
ACManager acManager = new ACManager();
54+
this.setAttackSpeed = new SetAttackSpeed();
55+
this.setCustomHealth = new SetCustomHealth();
56+
this.resetStats = new ResetStats();
57+
4758
//Load Files
4859
loadFiles();
4960

5061
//Startup Message
5162
consoleMessage("");
52-
consoleMessage(" " + ChatColor.RED + "CombatPlus " + ChatColor.UNDERLINE + "v" + this.getDescription().getVersion());
63+
consoleMessage(" " + ChatColor.RED + "Combat Plus v" + this.getDescription().getVersion());
5364
consoleMessage("");
54-
consoleMessage(" " + ChatColor.BOLD + "Author: " + ChatColor.UNDERLINE + "Nik");
65+
consoleMessage(" " + ChatColor.WHITE + "Author: Nik");
5566
consoleMessage("");
5667

5768
//Unsupported Version Checker
@@ -70,16 +81,15 @@ public void onEnable() {
7081
checkForUpdates();
7182

7283
//Load bStats
73-
int pluginID = 6982;
74-
MetricsLite metricsLite = new MetricsLite(this, pluginID);
84+
MetricsLite metricsLite = new MetricsLite(this, 6982);
7585

7686
//Hook PlaceholderAPI
7787
if (MiscUtils.isPlaceholderApiEnabled()) {
78-
new PapiHook(this).register();
88+
papiHook.register();
7989
}
8090

8191
//Hook AntiCheat
82-
new ACManager().hookAntiCheat();
92+
acManager.hookAntiCheat();
8393
}
8494
@Override
8595
public void onDisable() {
@@ -132,21 +142,21 @@ private void setDefaultStats() {
132142
private void loadStats() {
133143
if (isEnabled("combat.settings.old_pvp")) {
134144
Bukkit.getOnlinePlayers().forEach(player -> {
135-
new SetAttackSpeed().setAttackSpd(player);
145+
setAttackSpeed.setAttackSpd(player);
136146
});
137147
} else {
138148
Bukkit.getOnlinePlayers().forEach(player -> {
139-
new ResetStats().resetAttackSpeed(player);
149+
resetStats.resetAttackSpeed(player);
140150
});
141151
}
142152

143153
if (isEnabled("custom.player_health.enabled")) {
144154
Bukkit.getOnlinePlayers().forEach(player -> {
145-
new SetCustomHealth().setHealth(player);
155+
setCustomHealth.setHealth(player);
146156
});
147157
} else {
148158
Bukkit.getOnlinePlayers().forEach(player -> {
149-
new ResetStats().resetMaxHealth(player);
159+
resetStats.resetMaxHealth(player);
150160
});
151161
}
152162
}

‎src/main/java/me/nik/combatplus/commands/subcommands/Menu.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.nik.combatplus.commands.subcommands;
22

33
import me.nik.combatplus.CombatPlus;
4-
import me.nik.combatplus.api.GUIManager;
54
import me.nik.combatplus.commands.SubCommand;
5+
import me.nik.combatplus.utils.GUIManager;
66
import me.nik.combatplus.utils.Messenger;
77
import org.bukkit.entity.Player;
88

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.bukkit.entity.Arrow;
66
import org.bukkit.entity.Player;
77
import org.bukkit.event.EventHandler;
8-
import org.bukkit.event.EventPriority;
98
import org.bukkit.event.Listener;
109
import org.bukkit.event.entity.EntityDamageByEntityEvent;
1110
import org.bukkit.projectiles.ProjectileSource;
@@ -19,7 +18,7 @@ public class BowBoost implements Listener {
1918
This Listener prevents players hitting themselves with a bow
2019
*/
2120

22-
@EventHandler(priority = EventPriority.LOW)
21+
@EventHandler
2322
public void onArrowDamage(EntityDamageByEntityEvent e) {
2423
if (!(e.getEntity() instanceof Player)) return;
2524
if (!(e.getDamager() instanceof Arrow)) return;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import me.nik.combatplus.utils.Messenger;
55
import org.bukkit.entity.Player;
66
import org.bukkit.event.EventHandler;
7-
import org.bukkit.event.EventPriority;
87
import org.bukkit.event.Listener;
98
import org.bukkit.event.inventory.PrepareItemCraftEvent;
109
import org.bukkit.inventory.CraftingInventory;
@@ -20,7 +19,7 @@ public class DisabledItems implements Listener {
2019
This Listener Disables the crafting of the items defined in the Config
2120
*/
2221

23-
@EventHandler(priority = EventPriority.HIGHEST)
22+
@EventHandler
2423
public void onCraft(PrepareItemCraftEvent e) {
2524
if (e.getViewers().size() < 1) return;
2625
if (disabledItems == null) return;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.nik.combatplus.listeners;
22

33
import me.nik.combatplus.CombatPlus;
4-
import me.nik.combatplus.api.GUIManager;
54
import me.nik.combatplus.files.Config;
65
import me.nik.combatplus.handlers.CombatPlusHolder;
6+
import me.nik.combatplus.utils.GUIManager;
77
import me.nik.combatplus.utils.Messenger;
88
import org.bukkit.ChatColor;
99
import org.bukkit.Material;

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.bukkit.entity.Player;
77
import org.bukkit.event.Event;
88
import org.bukkit.event.EventHandler;
9-
import org.bukkit.event.EventPriority;
109
import org.bukkit.event.Listener;
1110
import org.bukkit.event.inventory.ClickType;
1211
import org.bukkit.event.inventory.InventoryClickEvent;
@@ -25,15 +24,15 @@ public class Offhand implements Listener {
2524
This Listener completely disables the use of the Offhand
2625
*/
2726

28-
@EventHandler(priority = EventPriority.HIGH)
27+
@EventHandler
2928
public void onSwapHands(PlayerSwapHandItemsEvent e) {
3029
if (worldUtils.offhandDisabledWorlds(e.getPlayer())) return;
3130
if (e.getPlayer().hasPermission("cp.bypass.offhand")) return;
3231
e.setCancelled(true);
3332
Messenger.debug(e.getPlayer(), "&3Offhand &f&l>> &6Canceled: &a" + e.isCancelled());
3433
}
3534

36-
@EventHandler(priority = EventPriority.HIGH)
35+
@EventHandler
3736
public void onClickOffHand(InventoryClickEvent e) {
3837
if (worldUtils.offhandDisabledWorlds((Player) e.getWhoClicked())) return;
3938
if (e.getWhoClicked().hasPermission("cp.bypass.offhand")) return;
@@ -45,7 +44,7 @@ public void onClickOffHand(InventoryClickEvent e) {
4544
}
4645
}
4746

48-
@EventHandler(priority = EventPriority.HIGH)
47+
@EventHandler
4948
public void onDrag(InventoryDragEvent e) {
5049
if (worldUtils.offhandDisabledWorlds((Player) e.getWhoClicked())) return;
5150
if (e.getWhoClicked().hasPermission("cp.bypass.offhand")) return;

src/main/java/me/nik/combatplus/api/GUIManager.java renamed to src/main/java/me/nik/combatplus/utils/GUIManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
package me.nik.combatplus.api;
1+
package me.nik.combatplus.utils;
22

33
import me.nik.combatplus.CombatPlus;
44
import me.nik.combatplus.files.Config;
55
import me.nik.combatplus.files.Lang;
66
import me.nik.combatplus.handlers.CombatPlusHolder;
7-
import me.nik.combatplus.utils.Messenger;
87
import org.bukkit.Bukkit;
98
import org.bukkit.ChatColor;
109
import org.bukkit.Material;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
public class SetAttackSpeed {
88
private final double attackSpeed = Config.get().getDouble("advanced.settings.old_pvp.attack_speed");
99
private final WorldUtils worldUtils = new WorldUtils();
10+
private final ResetStats resetStats = new ResetStats();
1011

1112
public void setAttackSpd(Player player) {
1213
if (worldUtils.combatDisabledWorlds(player)) {
13-
new ResetStats().resetAttackSpeed(player);
14+
resetStats.resetAttackSpeed(player);
1415
return;
1516
}
1617
player.getAttribute(Attribute.GENERIC_ATTACK_SPEED).setBaseValue(attackSpeed);

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
name: CombatPlus
2-
version: 1.3.1
2+
version: 1.3.2
33
main: me.nik.combatplus.CombatPlus
44
api-version: 1.13
55
authors: [Nik]
66
prefix: CombatPlus
7-
load: POSTWORLD
87
description: The all in one Combat System!
98
website: https://discord.gg/m7j2Y9H
109
softdepend: [PlaceholderAPI, Matrix]

0 commit comments

Comments
 (0)