Skip to content

Commit a7544b8

Browse files
NikV2NikV2
committed
Commit
1 parent c59d535 commit a7544b8

6 files changed

Lines changed: 13 additions & 56 deletions

File tree

‎CombatPlus.iml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@
2525
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
2626
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
2727
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
28-
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.2" level="project" />
28+
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.3" level="project" />
2929
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" 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.6" level="project" />
32-
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.jiangdashao:matrix-api-repo:317d4635fd" level="project" />
3332
</component>
3433
</module>

‎pom.xml‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>me.nik</groupId>
88
<artifactId>CombatPlus</artifactId>
9-
<version>1.0.0</version>
9+
<version>1.4.9</version>
1010
<packaging>jar</packaging>
1111

1212
<name>CombatPlus</name>
@@ -83,11 +83,6 @@
8383
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
8484
</repository>
8585

86-
<repository>
87-
<id>jitpack.io</id>
88-
<url>https://jitpack.io</url>
89-
</repository>
90-
9186
</repositories>
9287

9388
<dependencies>
@@ -113,11 +108,5 @@
113108
<scope>provided</scope>
114109
</dependency>
115110

116-
<dependency>
117-
<groupId>com.github.jiangdashao</groupId>
118-
<artifactId>matrix-api-repo</artifactId>
119-
<version>317d4635fd</version>
120-
<scope>provided</scope>
121-
</dependency>
122111
</dependencies>
123112
</project>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import me.nik.combatplus.listeners.fixes.Projectiles;
2222
import me.nik.combatplus.managers.MsgType;
2323
import me.nik.combatplus.managers.commentedfiles.CommentedFileConfiguration;
24-
import me.nik.combatplus.utils.ACManager;
2524
import me.nik.combatplus.utils.CustomRecipes;
2625
import me.nik.combatplus.utils.MiscUtils;
2726
import me.nik.combatplus.utils.ResetStats;
@@ -101,9 +100,6 @@ public void onEnable() {
101100
if (MiscUtils.isPlaceholderApiEnabled()) {
102101
new PapiHook(this).register();
103102
}
104-
105-
//Hook AntiCheats
106-
new ACManager().hookMatrixAC();
107103
}
108104

109105
public CommentedFileConfiguration getConfiguration() {

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

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,12 @@
1919

2020
public class Blocking implements Listener {
2121

22+
private static final String[] interactiveBlocks = {"DOOR", "TABLE", "STAND", "CHEST", "GATE", "DISPENSER", "DROPPER", "NOTE", "REDSTONE", "DIODE", "FRAME", "LEVER", "SHULKER", "FURNACE", "BARREL"};
23+
2224
private final WorldUtils worldUtils = new WorldUtils();
2325

2426
private final HashMap<UUID, Long> blocking = new HashMap<>();
2527

26-
private boolean interactiveBlock(Block block) {
27-
String b = block.getType().name();
28-
return b.contains("DOOR")
29-
|| b.contains("TABLE")
30-
|| b.contains("STAND")
31-
|| b.contains("CHEST")
32-
|| b.contains("GATE")
33-
|| b.contains("DISPENSER")
34-
|| b.contains("DROPPER")
35-
|| b.contains("NOTE")
36-
|| b.contains("REDSTONE")
37-
|| b.contains("DIODE")
38-
|| b.contains("FRAME")
39-
|| b.contains("LEVER")
40-
|| b.contains("SHULKER")
41-
|| b.contains("FURNACE")
42-
|| b.contains("BARREL");
43-
}
44-
4528
private boolean holdsShield(Player p) {
4629
return p.getInventory().getItemInOffHand().getType().name().contains("SHIELD");
4730
}
@@ -53,9 +36,15 @@ public void onBlock(PlayerInteractEvent e) {
5336
if (!action.name().contains("RIGHT_CLICK")) return;
5437

5538
final Block block = e.getClickedBlock();
56-
if (action == Action.RIGHT_CLICK_BLOCK && block != null && interactiveBlock(block)) return;
39+
if (action == Action.RIGHT_CLICK_BLOCK && block != null) return;
5740
if (!e.getItem().getType().name().contains("SWORD")) return;
5841

42+
for (String s : interactiveBlocks) {
43+
if (block.getType().name().contains(s)) {
44+
return;
45+
}
46+
}
47+
5948
Player p = e.getPlayer();
6049
if (worldUtils.combatDisabledWorlds(p)) return;
6150
if (Config.Setting.SWORD_BLOCKING_IGNORE_SHIELDS.getBoolean() && holdsShield(e.getPlayer())) return;

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

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/main/resources/plugin.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: CombatPlus
2-
version: 1.4.8
2+
version: ${project.version}
33
main: me.nik.combatplus.CombatPlus
44
api-version: 1.13
55
authors: [Nik]
66
prefix: CombatPlus
7-
description: The all in one Combat System!
7+
description: ${project.description}
88
website: https://discord.gg/m7j2Y9H
99
softdepend: [PlaceholderAPI, Matrix]
1010
commands:

0 commit comments

Comments
 (0)