Skip to content

Commit b40ad65

Browse files
authored
GH-1071 Remove heal configuration (#1071)
1 parent 2169d18 commit b40ad65

File tree

3 files changed

+4
-31
lines changed

3 files changed

+4
-31
lines changed

eternalcore-core/src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.eternalcode.core.feature.automessage.AutoMessageSettings;
77
import com.eternalcode.core.feature.catboy.CatBoySettings;
88
import com.eternalcode.core.feature.chat.ChatSettings;
9-
import com.eternalcode.core.feature.heal.HealConfiguration;
109
import com.eternalcode.core.feature.helpop.HelpOpSettings;
1110
import com.eternalcode.core.feature.jail.JailSettings;
1211
import com.eternalcode.core.feature.randomteleport.RandomTeleportSettingsImpl;
@@ -145,9 +144,6 @@ public static class Homes extends OkaeriConfig {
145144
};
146145
}
147146

148-
@Bean
149-
public HealConfiguration heal = new HealConfiguration();
150-
151147
@Comment({ " ", "# Awesome sounds" })
152148
@Bean
153149
public Sounds sound = new Sounds();

eternalcore-core/src/main/java/com/eternalcode/core/feature/heal/HealCommand.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.eternalcode.core.feature.heal;
22

33
import com.eternalcode.annotations.scan.command.DescriptionDocs;
4-
import com.eternalcode.core.configuration.implementation.PluginConfiguration;
54
import com.eternalcode.core.injector.annotations.Inject;
65
import com.eternalcode.core.notice.NoticeService;
76
import com.eternalcode.core.util.PotionEffectUtil;
@@ -18,12 +17,10 @@
1817
class HealCommand {
1918

2019
private final NoticeService noticeService;
21-
private final HealConfiguration healConfiguration;
2220

2321
@Inject
24-
HealCommand(NoticeService noticeService, PluginConfiguration pluginConfiguration) {
22+
HealCommand(NoticeService noticeService) {
2523
this.noticeService = noticeService;
26-
this.healConfiguration = pluginConfiguration.heal;
2724
}
2825

2926
@Execute
@@ -69,11 +66,10 @@ private void heal(Player player) {
6966
player.setRemainingAir(player.getMaximumAir());
7067

7168
for (PotionEffect effect : player.getActivePotionEffects()) {
72-
if (healConfiguration.removeOnlyNegativeEffects) {
73-
if (!PotionEffectUtil.isNegativeEffect(effect.getType())) {
74-
continue;
75-
}
69+
if (!PotionEffectUtil.isNegativeEffect(effect.getType())) {
70+
continue;
7671
}
72+
7773
player.removePotionEffect(effect.getType());
7874
}
7975
}

eternalcore-core/src/main/java/com/eternalcode/core/feature/heal/HealConfiguration.java

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

0 commit comments

Comments
 (0)