Skip to content

Commit cd89c51

Browse files
NikV2NikV2
committed
Commit
1 parent 11ddfa3 commit cd89c51

5 files changed

Lines changed: 49 additions & 4 deletions

File tree

‎CombatPlus.iml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,6 @@
2929
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
3030
<orderEntry type="library" name="Maven: org.bstats:bstats-bukkit-lite:1.7" level="project" />
3131
<orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.10.5" level="project" />
32+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.jiangdashao:matrix-api-repo:317d4635fd" level="project" />
3233
</component>
3334
</module>

‎pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,42 +62,63 @@
6262
</build>
6363

6464
<repositories>
65+
6566
<repository>
6667
<id>spigotmc-repo</id>
6768
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
6869
</repository>
70+
6971
<repository>
7072
<id>sonatype</id>
7173
<url>https://oss.sonatype.org/content/groups/public/</url>
7274
</repository>
75+
7376
<repository>
7477
<id>CodeMC</id>
7578
<url>https://repo.codemc.org/repository/maven-public</url>
7679
</repository>
80+
7781
<repository>
7882
<id>placeholderapi</id>
7983
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
8084
</repository>
85+
86+
<repository>
87+
<id>jitpack.io</id>
88+
<url>https://jitpack.io</url>
89+
</repository>
90+
8191
</repositories>
8292

8393
<dependencies>
94+
8495
<dependency>
8596
<groupId>org.spigotmc</groupId>
8697
<artifactId>spigot-api</artifactId>
8798
<version>1.15.2-R0.1-SNAPSHOT</version>
8899
<scope>provided</scope>
89100
</dependency>
101+
90102
<dependency>
91103
<groupId>org.bstats</groupId>
92104
<artifactId>bstats-bukkit-lite</artifactId>
93105
<version>1.7</version>
94106
<scope>compile</scope>
95107
</dependency>
108+
96109
<dependency>
97110
<groupId>me.clip</groupId>
98111
<artifactId>placeholderapi</artifactId>
99112
<version>2.10.5</version>
100113
<scope>provided</scope>
101114
</dependency>
115+
116+
<dependency>
117+
<groupId>com.github.jiangdashao</groupId>
118+
<artifactId>matrix-api-repo</artifactId>
119+
<version>317d4635fd</version>
120+
<scope>provided</scope>
121+
</dependency>
122+
102123
</dependencies>
103124
</project>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import me.nik.combatplus.listeners.fixes.NoFall;
2424
import me.nik.combatplus.listeners.fixes.Projectiles;
2525
import me.nik.combatplus.listeners.fixes.Speed;
26+
import me.nik.combatplus.utils.ACManager;
2627
import me.nik.combatplus.utils.CustomRecipes;
2728
import me.nik.combatplus.utils.Messenger;
2829
import me.nik.combatplus.utils.MiscUtils;
@@ -56,7 +57,7 @@ public void onEnable() {
5657
checkSupported();
5758

5859
//Load Commands
59-
this.getCommand("combatplus").setExecutor(new CommandManager(this));
60+
getCommand("combatplus").setExecutor(new CommandManager(this));
6061

6162
//Load Listeners
6263
initialize();
@@ -75,6 +76,9 @@ public void onEnable() {
7576
if (MiscUtils.isPlaceholderApiEnabled()) {
7677
new PapiHook(this).register();
7778
}
79+
80+
//Hook AntiCheat
81+
new ACManager().hookAntiCheat();
7882
}
7983
@Override
8084
public void onDisable() {
@@ -88,7 +92,7 @@ public void onDisable() {
8892
Lang.save();
8993

9094
//Unload Instances
91-
this.getCommand("combatplus").setExecutor(null);
95+
getCommand("combatplus").setExecutor(null);
9296

9397
//Done
9498
consoleMessage(Messenger.message("console.disabled"));

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package me.nik.combatplus.utils;
2+
3+
import me.rerere.matrix.api.HackType;
4+
import me.rerere.matrix.api.MatrixAPI;
5+
import me.rerere.matrix.api.MatrixAPIProvider;
6+
import org.bukkit.Bukkit;
7+
import org.bukkit.plugin.PluginManager;
8+
9+
public class ACManager {
10+
11+
private final PluginManager pm = Bukkit.getPluginManager();
12+
13+
public void hookAntiCheat() {
14+
if (pm.getPlugin("Matrix") != null) {
15+
MatrixAPI ac = MatrixAPIProvider.getAPI();
16+
ac.setEnable(HackType.FASTHEAL, false);
17+
}
18+
}
19+
}

‎src/main/resources/plugin.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name: CombatPlus
2-
version: 1.2.7
2+
version: 1.2.8
33
main: me.nik.combatplus.CombatPlus
44
api-version: 1.13
55
authors: [Nik]
66
prefix: CombatPlus
77
load: POSTWORLD
88
description: The all in one Combat System!
99
website: https://discord.gg/m7j2Y9H
10-
softdepend: [PlaceholderAPI]
10+
softdepend: [PlaceholderAPI, Matrix]
1111
commands:
1212
combatplus:
1313
description: The all in one Combat System!

0 commit comments

Comments
 (0)