Skip to content

Commit 654071f

Browse files
NikV2NikV2
committed
Commit
1 parent 3a7f332 commit 654071f

4 files changed

Lines changed: 7 additions & 6 deletions

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ private void checkSupported() {
230230
Config.get().set("golden_apple_cooldown.golden_apple.enabled", false);
231231
Config.get().set("fixes.kill_aura", false);
232232
Config.get().set("recipes.enchanted_golden_apple", false);
233+
Config.get().set("fixes.health_spoof", false);
233234
Config.save();
234235
Config.reload();
235236
consoleMessage(Messenger.message("console.unsupported_version"));
@@ -239,6 +240,7 @@ private void checkSupported() {
239240
Config.get().set("golden_apple_cooldown.enchanted_golden_apple.enabled", false);
240241
Config.get().set("golden_apple_cooldown.golden_apple.enabled", false);
241242
Config.get().set("recipes.enchanted_golden_apple", false);
243+
Config.get().set("fixes.health_spoof", false);
242244
Config.save();
243245
Config.reload();
244246
consoleMessage(Messenger.message("console.unsupported_version"));
@@ -247,6 +249,7 @@ private void checkSupported() {
247249
Config.get().set("golden_apple_cooldown.enchanted_golden_apple.enabled", false);
248250
Config.get().set("golden_apple_cooldown.golden_apple.enabled", false);
249251
Config.get().set("recipes.enchanted_golden_apple", false);
252+
Config.get().set("fixes.health_spoof", false);
250253
Config.save();
251254
Config.reload();
252255
consoleMessage(Messenger.message("console.unsupported_version"));

‎src/main/java/me/nik/combatplus/files/Config.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public static void addDefaults() {
8181
Config.get().addDefault("fixes.kill_aura", false);
8282
Config.get().addDefault("fixes.projectile_fixer", true);
8383
Config.get().addDefault("fixes.invalid_criticals", true);
84-
Config.get().addDefault("fixes.health_spoof", true);
85-
Config.get().addDefault("fixes.no_fall", true);
84+
Config.get().addDefault("fixes.health_spoof", false);
85+
Config.get().addDefault("fixes.no_fall", false);
8686
Config.get().addDefault("fixes.speed", false);
8787
Config.get().addDefault("fixes.bad_packets", true);
8888
Config.get().addDefault("custom.player_health.enabled", false);

‎src/main/java/me/nik/combatplus/listeners/fixes/HealthSpoof.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import me.nik.combatplus.CombatPlus;
44
import me.nik.combatplus.utils.Messenger;
5-
import org.bukkit.Material;
65
import org.bukkit.entity.Player;
76
import org.bukkit.event.EventHandler;
87
import org.bukkit.event.EventPriority;
@@ -44,7 +43,6 @@ private boolean shouldDie(EntityDamageEvent e, Player p) {
4443
}
4544

4645
private boolean holdsTotem(Player p) {
47-
Material totem = Material.TOTEM_OF_UNDYING;
48-
return p.getInventory().getItemInMainHand().getType() == totem || p.getInventory().getItemInOffHand().getType() == totem;
46+
return p.getInventory().getItemInMainHand().getType().name().contains("TOTEM") || p.getInventory().getItemInOffHand().getType().name().contains("TOTEM");
4947
}
5048
}

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

0 commit comments

Comments
 (0)