Merge remote-tracking branch 'origin/feature/add-reset-timer' into feature/add-reset-timer

# Conflicts:
#	eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatPlugin.java

Author: Jakubk15

eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatPlugin.java

@@ -189,6 +189,7 @@ public void onEnable() {
             new FightActionBlockerController(this.fightManager, noticeService, pluginConfig, server),
             new PearlController(pluginConfig, this.pearlService, noticeService),
             new TridentController(pluginConfig, noticeService, this.fightManager, this.tridentService, server),
+            new DeathEffectController(pluginConfig),
             new DeathFlareController(pluginConfig, server, scheduler, this),
             new DeathLightningController(pluginConfig, server),
             new UpdaterNotificationController(updaterService, pluginConfig, this.audienceProvider, miniMessage),