GH-446 Bump runpaper version to 26.3, fix wrong config instance in SpearService, update names for better readability (#446)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/gradle.yml

@@ -13,21 +13,21 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
 
       - name: Set Variables & Build
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const isPR = context.eventName === 'pull_request';

.github/workflows/hangar-publish.yml

@@ -14,17 +14,17 @@ jobs:
       contents: read
     if: (github.event_name == 'push' && !contains(github.event.head_commit.message, '[ci skip]')) || github.event_name == 'release'
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
       - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'temurin'
       
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         
       - name: Publish to Hangar
         run: ./gradlew :eternalcombat-plugin:publishPluginPublicationToHangar

.github/workflows/modrinth-publish.yml

@@ -14,17 +14,17 @@ jobs:
       contents: read
     if: (github.event_name == 'push' && !contains(github.event.head_commit.message, '[ci skip]')) || github.event_name == 'release'
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
       - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'temurin'
       
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         
       - name: Publish to Modrinth
         run: ./gradlew :eternalcombat-plugin:modrinth

.github/workflows/publish.yml

@@ -9,13 +9,13 @@ jobs:
     environment: deployment
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 25
           cache: 'gradle'
 
       - name: Grant execute permission for gradlew

.gitignore

@@ -1,6 +1,7 @@
 .classpath
 .idea
 .gradle
+.kotlin
 .project
 .settings
 bin

README.md

@@ -25,7 +25,7 @@
 ## EternalCombat requires PacketEvents plugin to work.
 You can download it from [here](https://modrinth.com/plugin/packetevents)
 
-EternalCombat 2.0 has been tested on Minecraft versions **1.17.1 to 1.21.11**, but it should work seamlessly on most
+EternalCombat 2.0 has been tested on Minecraft versions **1.17.1 to 26.2**, but it should work seamlessly on most
 other versions too.
 If you run into any compatibility issues, please let us know in
 the [Issues tab](https://github.com/EternalCodeTeam/EternalCombat/issues).
@@ -45,9 +45,13 @@ fair, heart-pounding battles that keep players on their toes. Here’s a rundown
   in action:  
   <img alt="Combat log anti logout feature" src="https://github.com/EternalCodeTeam/EternalCombat/blob/master/assets/combatlog.gif?raw=true" width="420">
 
+- **Support for newest features**  
+  Our plugin features cooldown and delays for tridents, spears and much more. With **out of the box** configurable feats.  
+  <img alt="Trident and spear cooldown feature" src="https://github.com/EternalCodeTeam/EternalCombat/blob/master/assets/spear.gif?raw=true" width="420">
+
 - **Customize combat experience**  
-  Add custom effects to players in combat or death. Everything should be configurable and user-friendly:
-  <img alt="Lightning strikes when players die" src="https://github.com/EternalCodeTeam/EternalCombat/blob/master/assets/lightning.gif?raw=true" width="420">
+  Add custom effects to players in combat or death. Everything should be configurable and user-friendly:  
+  <img alt="Lightning strikes when players die" src="https://github.com/EternalCodeTeam/EternalCombat/blob/master/assets/lightning.gif?raw=true" width="420">  
   <img alt="Flare indicates players death location" src="https://github.com/EternalCodeTeam/EternalCombat/blob/master/assets/flare.gif?raw=true" width="420">
 
 - **Spawn Protection (Configurable)**  
@@ -57,7 +61,7 @@ fair, heart-pounding battles that keep players on their toes. Here’s a rundown
 
 - **Crystal PvP support**  
   Engage in intense Crystal PvP battles without worrying about players logging out mid-fight! EternalCombat keeps
-  everyone in the game until the last anchor hit. Check it out:
+  everyone in the game until the last anchor hit. Check it out:  
   <img alt="Crystal PvP showcase" src="https://github.com/EternalCodeTeam/EternalCombat/blob/master/assets/crystals.gif?raw=true" width="420">
 
 - **Fully Customizable Combat**  
@@ -87,6 +91,8 @@ Control who can use EternalCombat’s powerful features with these permissions:
 | `eternalcombat.status`         | Check a player’s combat status with `/combatlog status <player>`.                                     |
 | `eternalcombat.tag`            | Start a fight between players using `/combatlog tag <player> [player2]`.                              |
 | `eternalcombat.untag`          | Remove a player from combat with `/combatlog untag <player>`.                                         |
+| `eternalcombat.untagall`       | Remove all players from combat with `/combatlog untagall`.               |
+| `eternalcombat.stats`          | View combat statistics with `/combatlog stats`.                          |
 | `eternalcombat.reload`         | Reload the plugin with `/combatlog reload`.                                                           |
 | `eternalcombat.receiveupdates` | Receive notifications about new plugin versions on join.                                              |
 | `eternalcombat.bypass`         | When exclude `excludeAdminsFromCombat` is set to `true` users with this permission will not be tagged |
@@ -137,7 +143,7 @@ With Maven:
 With Gradle:
 
 ```kts
-compileOnly("com.eternalcode:eternalcombat-api:2.5.0-SNAPSHOT")
+compileOnly("com.eternalcode:eternalcombat-api:2.6.0-SNAPSHOT")
 ```
 
 With Maven:
@@ -147,7 +153,7 @@ With Maven:
 <dependency>
     <groupId>com.eternalcode</groupId>
     <artifactId>eternalcombat-api</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.6.0-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```

buildSrc/build.gradle.kts

@@ -8,10 +8,12 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.10")
-    implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.3.2")
+    implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.6.1")
+    implementation("com.modrinth.minotaur:com.modrinth.minotaur.gradle.plugin:2.10.0")
+    implementation("io.papermc.hangar-publish-plugin:io.papermc.hangar-publish-plugin.gradle.plugin:0.1.4")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.4.20")
     implementation("net.minecrell:plugin-yml:0.6.0")
-    implementation("xyz.jpenilla:run-task:3.0.2")
+    implementation("xyz.jpenilla:run-task:3.1.0")
 }
 
 sourceSets {

buildSrc/src/main/kotlin/EternalCombatPublishing.kt

@@ -0,0 +1,39 @@
+import org.gradle.api.Project
+import org.gradle.api.provider.Provider
+
+internal val Project.isRelease: Boolean
+    get() = providers.environmentVariable("GITHUB_EVENT_NAME").orNull == "release"
+
+internal val Project.releaseChannel: String
+    get() = if (isRelease) "Release" else "Snapshot"
+
+internal val Project.changelogText: Provider<String>
+    get() = providers.environmentVariable("CHANGELOG")
+        .orElse(providers.exec { commandLine("git", "log", "-1", "--format=%B") }.standardOutput.asText)
+
+internal val Project.paperVersions: List<String>
+    get() = property("paperVersion").toString()
+        .split(",")
+        .map { paperVersion -> paperVersion.trim() }
+
+internal fun Project.configureSnapshotVersionFromGit() {
+    val isGithubWorkflow = providers.environmentVariable("GITHUB_RUN_NUMBER").isPresent
+
+    if (!isGithubWorkflow || isRelease) {
+        return
+    }
+
+    if ("-SNAPSHOT+" in version.toString()) {
+        return
+    }
+
+    val describeParts = providers.exec { commandLine("git", "describe", "--tags", "--long") }
+        .standardOutput.asText.get()
+        .trim()
+        .split("-")
+
+    val offset = if (describeParts.size >= 3) describeParts[describeParts.size - 2] else "0"
+    val baseVersion = version.toString().substringBefore("-SNAPSHOT")
+
+    version = "$baseVersion-SNAPSHOT+$offset"
+}

buildSrc/src/main/kotlin/Versions.kt

@@ -1,39 +1,34 @@
 object Versions {
 
-    const val SPIGOT_API = "1.17.1-R0.1-SNAPSHOT"
+    // Keep this version for best compatibility.
+    const val PAPER_API = "1.19.3-R0.1-SNAPSHOT"
 
-    const val JUNIT_JUPITER_API = "6.0.3"
-    const val JUNIT_JUPITER_PARAMS = "6.0.3"
-    const val JUNIT_JUPITER_ENGINE = "6.0.3"
+    const val JUNIT_JUPITER_API = "6.1.3"
+    const val JUNIT_JUPITER_PARAMS = "6.1.3"
+    const val JUNIT_JUPITER_ENGINE = "6.1.3"
 
     const val JETBRAINS_ANNOTATIONS = "26.1.0"
 
-    const val ETERNALCODE_COMMONS = "1.3.4"
-    const val MULTIFICATION = "1.2.4"
-    const val PACKETS_EVENTS = "2.11.2"
+    const val ETERNALCODE_COMMONS = "1.4.1"
+    const val MULTIFICATION = "1.2.5-SNAPSHOT"
+    const val PACKETS_EVENTS = "2.13.0"
 
-    const val ADVENTURE_PLATFORM_BUKKIT = "4.4.1"
-    const val ADVENTURE_API = "4.26.1"
-
-    const val LITE_COMMANDS = "3.10.9"
+    const val LITE_COMMANDS = "3.11.0"
     const val OKAERI_CONFIGS_SERDES_COMMONS = "5.0.13"
     const val OKAERI_CONFIGS_SERDES_BUKKIT = "5.0.13"
 
-    const val XSERIES = "13.6.0"
+    const val XSERIES = "13.8.0"
 
-    const val CAFFEINE = "3.2.3"
+    const val CAFFEINE = "3.3.0"
 
     const val B_STATS_BUKKIT = "3.2.1"
-    const val WORLD_GUARD_BUKKIT = "7.0.15"
-
-    const val PLACEHOLDER_API = "2.12.2"
-    const val LANDS_API = "7.24.1"
-    const val PAPERLIB = "1.0.8"
+    const val WORLD_GUARD_BUKKIT = "7.0.17"
 
+    const val PLACEHOLDER_API = "2.12.3"
+    const val LANDS_API = "7.25.4"
+    const val GRIEF_PREVENTION = "16.18.7"
     const val WORLDEDIT = "3ISh7ADm" //cannot use numeric version bc of duplicated version on modrinth
-    const val PACKETEVENTS = "2.11.1"
-    const val WORLDGUARD = "7.0.15-beta-01"
-    const val LUCKPERMS = "5.5.17"
+    const val PACKETEVENTS = "2.14.0"
 
 }
 

buildSrc/src/main/kotlin/eternalcombat-java-unit-test.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    testImplementation("org.spigotmc:spigot-api:${Versions.SPIGOT_API}")
+    testImplementation("io.papermc.paper:paper-api:${Versions.PAPER_API}")
     testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.JUNIT_JUPITER_API}")
     testImplementation("org.junit.jupiter:junit-jupiter-params:${Versions.JUNIT_JUPITER_PARAMS}")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT_JUPITER_ENGINE}")

buildSrc/src/main/kotlin/eternalcombat-java.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "com.eternalcode"
-version = "2.5.0-SNAPSHOT"
+version = "2.6.0-SNAPSHOT"
 
 tasks.compileJava {
     options.compilerArgs = listOf("-Xlint:deprecation", "-parameters")

buildSrc/src/main/kotlin/eternalcombat-publish-hangar.gradle.kts

@@ -0,0 +1,28 @@
+import io.papermc.hangarpublishplugin.model.Platforms
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+    id("io.papermc.hangar-publish-plugin")
+}
+
+configureSnapshotVersionFromGit()
+
+pluginManager.withPlugin("com.gradleup.shadow") {
+    val shadowJarTask = tasks.named<ShadowJar>("shadowJar")
+
+    hangarPublish {
+        publications.register("plugin") {
+            version.set(project.version.toString())
+            channel.set(project.releaseChannel)
+            changelog.set(project.changelogText)
+            id.set("eternalcombat")
+            apiKey.set(providers.environmentVariable("HANGAR_API_TOKEN"))
+            platforms {
+                register(Platforms.PAPER) {
+                    jar.set(shadowJarTask.flatMap { shadowJar -> shadowJar.archiveFile })
+                    platformVersions.set(project.paperVersions)
+                }
+            }
+        }
+    }
+}

buildSrc/src/main/kotlin/eternalcombat-publish-modrinth.gradle.kts

@@ -0,0 +1,23 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+    id("com.modrinth.minotaur")
+}
+
+configureSnapshotVersionFromGit()
+
+pluginManager.withPlugin("com.gradleup.shadow") {
+    val shadowJarTask = tasks.named<ShadowJar>("shadowJar")
+
+    modrinth {
+        token.set(providers.environmentVariable("MODRINTH_TOKEN"))
+        projectId.set("eternalcombat")
+        versionNumber.set(project.version.toString())
+        versionType.set(if (project.isRelease) "release" else "beta")
+        uploadFile.set(shadowJarTask)
+        gameVersions.addAll(project.paperVersions)
+        loaders.addAll(listOf("paper", "folia", "purpur"))
+        changelog.set(project.changelogText)
+        syncBodyFrom.set(rootProject.file("README.md").readText())
+    }
+}

buildSrc/src/main/kotlin/eternalcombat-publish.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "com.eternalcode"
-version = "2.5.0-SNAPSHOT"
+version = "2.6.0-SNAPSHOT"
 
 java {
     withSourcesJar()

buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts

@@ -3,10 +3,10 @@ plugins {
 }
 
 repositories {
+    mavenLocal()
+    mavenCentral()
     maven("https://repo.eternalcode.pl/releases")
     maven("https://repo.eternalcode.pl/snapshots")
-
-    mavenCentral()
     maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
     maven("https://repo.papermc.io/repository/maven-public/")
     maven("https://storehouse.okaeri.eu/repository/maven-public/")

buildSrc/src/main/kotlin/eternalcombat-runserver.gradle.kts

@@ -0,0 +1,23 @@
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.jvm.toolchain.JavaToolchainService
+
+plugins {
+    id("xyz.jpenilla.run-paper")
+}
+
+tasks {
+    val javaToolchains = extensions.getByType<JavaToolchainService>()
+
+    runServer {
+        javaLauncher.set(javaToolchains.launcherFor {
+            languageVersion.set(JavaLanguageVersion.of(25))
+        })
+
+        minecraftVersion("26.3")
+        downloadPlugins.modrinth("WorldEdit", "7.4.6")
+        downloadPlugins.modrinth("PacketEvents", "2.14.0+spigot")
+        downloadPlugins.modrinth("WorldGuard", "7.0.20")
+        downloadPlugins.modrinth("LuckPerms", "v5.5.53-bukkit")
+        downloadPlugins.modrinth("GriefPrevention", Versions.GRIEF_PREVENTION)
+    }
+}

eternalcombat-api/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    // Spigot api
-    compileOnlyApi("org.spigotmc:spigot-api:${Versions.SPIGOT_API}")
+    // Paper api
+    compileOnlyApi("io.papermc.paper:paper-api:${Versions.PAPER_API}")
     api("org.jetbrains:annotations:${Versions.JETBRAINS_ANNOTATIONS}")
 }

eternalcombat-api/src/main/java/com/eternalcode/combat/EternalCombatApi.java

@@ -4,7 +4,7 @@ import com.eternalcode.combat.fight.drop.DropKeepInventoryService;
 import com.eternalcode.combat.fight.FightManager;
 import com.eternalcode.combat.fight.drop.DropService;
 import com.eternalcode.combat.fight.effect.FightEffectService;
-import com.eternalcode.combat.fight.pearl.FightPearlService;
+import com.eternalcode.combat.fight.pearl.PearlService;
 import com.eternalcode.combat.region.RegionProvider;
 import com.eternalcode.combat.fight.tagout.FightTagOutService;
 
@@ -14,7 +14,7 @@ public interface EternalCombatApi {
 
     RegionProvider getRegionProvider();
 
-    FightPearlService getFightPearlService();
+    PearlService getFightPearlService();
 
     FightTagOutService getFightTagOutService();
 

eternalcombat-api/src/main/java/com/eternalcode/combat/fight/event/CauseOfTag.java

@@ -23,6 +23,22 @@ public enum CauseOfTag {
      */
     CRYSTAL,
 
+    /**
+     * Trident usage extending combat tag.
+     */
+    TRIDENT,
+
+    /**
+     * Ender pearl usage extending combat tag.
+     */
+    ENDER_PEARL,
+
+
+    /**
+     * The player's combat tag was kept active because they were below the void combat height.
+     */
+    VOID,
+
     /**
      * A custom cause, typically defined by external plugins or systems, applied the combat tag.
      */

eternalcombat-api/src/main/java/com/eternalcode/combat/fight/event/FightTagEvent.java

@@ -5,7 +5,9 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 import java.util.UUID;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This event is triggered when a player is tagged in a fight.
@@ -15,14 +17,25 @@ public class FightTagEvent extends Event implements Cancellable {
     private static final HandlerList HANDLER_LIST = new HandlerList();
     private final UUID player;
     private final CauseOfTag cause;
+    private final UUID tagger;
     private boolean cancelled = false;
     private CancelTagReason cancelReason;
 
+    /**
+     * @deprecated use {@link #FightTagEvent(UUID, CauseOfTag, UUID)} instead, which also carries the tagger.
+     */
+    @Deprecated
+    @ApiStatus.ScheduledForRemoval
     public FightTagEvent(UUID player, CauseOfTag cause) {
+        this(player, cause, null);
+    }
+
+    public FightTagEvent(UUID player, CauseOfTag cause, @Nullable UUID tagger) {
         super(false);
 
         this.player = player;
         this.cause = cause;
+        this.tagger = tagger;
     }
 
     /**
@@ -43,6 +56,16 @@ public class FightTagEvent extends Event implements Cancellable {
         return this.cause;
     }
 
+    /**
+     * Gets the UUID of the player who caused this tag, if any.
+     *
+     * @return The UUID of the tagger, or {@code null} if the tag was not caused by another player.
+     */
+    @Nullable
+    public UUID getTagger() {
+        return this.tagger;
+    }
+
     @Override
     public boolean isCancelled() {
         return this.cancelled;

eternalcombat-api/src/main/java/com/eternalcode/combat/fight/pearl/PearlService.java

@@ -1,16 +1,16 @@
 package com.eternalcode.combat.fight.pearl;
 
 import java.time.Duration;
-import java.time.Instant;
 import java.util.UUID;
+import org.bukkit.entity.Player;
 
-public interface FightPearlService {
+public interface PearlService {
 
-    Instant getDelay(UUID uuid);
+    boolean shouldCancelEvent(UUID playerId);
 
     Duration getRemainingDelay(UUID uuid);
 
     boolean hasDelay(UUID uuid);
 
-    void markDelay(UUID uuid);
+    void handleDelay(Player uuid);
 }

eternalcombat-api/src/main/java/com/eternalcode/combat/fight/spear/SpearService.java

@@ -0,0 +1,11 @@
+package com.eternalcode.combat.fight.spear;
+
+import java.time.Duration;
+import java.util.UUID;
+
+public interface SpearService {
+    boolean isOnCooldown(UUID player);
+    void saveCooldown(UUID player);
+    Duration getRemainingCooldown(UUID player);
+    void removeCooldown(UUID player);
+}

eternalcombat-api/src/main/java/com/eternalcode/combat/fight/trident/TridentService.java

@@ -0,0 +1,31 @@
+package com.eternalcode.combat.fight.trident;
+
+import java.time.Duration;
+import java.util.UUID;
+
+public interface TridentService {
+
+    /**
+     * returns remaining delay for the player to use trident again
+     * @param uuid unique id of the player
+     * @return remaining duration left to use trident again by the player or zero
+     */
+    Duration getRemainingDelay(UUID uuid);
+
+    /**
+     * checks if player still has delay left to use trident
+     * @param uuid unique id of the player
+     * @return true if user still has cooldown left to use trident
+     */
+    boolean hasDelay(UUID uuid);
+
+    /**
+     * marks start of the delay for the user
+     * @param uuid unique id of the player
+     */
+    void markDelay(UUID uuid);
+
+
+    void removeDelay(UUID playerId);
+
+}

eternalcombat-plugin/build.gradle.kts

@@ -1,16 +1,16 @@
+
+import net.minecrell.pluginyml.paper.PaperPluginDescription
 import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
-import io.papermc.hangarpublishplugin.model.Platforms
-import org.gradle.kotlin.dsl.shadowJar
 
 plugins {
     `eternalcombat-java`
     `eternalcombat-repositories`
+    `eternalcombat-publish-hangar`
+    `eternalcombat-publish-modrinth`
+    `eternalcombat-runserver`
 
-    id("net.minecrell.plugin-yml.bukkit")
+    id("de.eldoria.plugin-yml.paper") version "0.9.0"
     id("com.gradleup.shadow")
-    id("xyz.jpenilla.run-paper")
-    id("com.modrinth.minotaur") version "2.9.0"
-    id("io.papermc.hangar-publish-plugin") version "0.1.4"
 }
 
 configurations.all {
@@ -27,14 +27,8 @@ configurations.all {
 dependencies {
     implementation(project(":eternalcombat-api"))
 
-    // kyori
-    implementation("net.kyori:adventure-platform-bukkit:${Versions.ADVENTURE_PLATFORM_BUKKIT}")
-    implementation("net.kyori:adventure-text-minimessage:${Versions.ADVENTURE_API}")
-    implementation("net.kyori:adventure-api") {
-        version {
-            strictly(Versions.ADVENTURE_API)
-        }
-    }
+    // Paper
+    compileOnly("io.papermc.paper:paper-api:${Versions.PAPER_API}")
 
     // litecommands
     implementation("dev.rollczi:litecommands-bukkit:${Versions.LITE_COMMANDS}")
@@ -68,39 +62,66 @@ dependencies {
     // Lands
     compileOnly("com.github.angeschossen:LandsAPI:${Versions.LANDS_API}")
 
+    // GriefPrevention
+    compileOnly("com.github.GriefPrevention:GriefPrevention:${Versions.GRIEF_PREVENTION}") {
+        isTransitive = false
+    }
+
     // Multification
-    implementation("com.eternalcode:multification-bukkit:${Versions.MULTIFICATION}")
+    implementation("com.eternalcode:multification-paper:${Versions.MULTIFICATION}")
     implementation("com.eternalcode:multification-okaeri:${Versions.MULTIFICATION}")
     compileOnly("com.github.retrooper:packetevents-spigot:${Versions.PACKETS_EVENTS}")
-    implementation("io.papermc:paperlib:${Versions.PAPERLIB}")
 }
 
-bukkit {
+paper {
     main = "com.eternalcode.combat.CombatPlugin"
-    author = "EternalCodeTeam"
-    apiVersion = "1.13"
+    authors = listOf("EternalCodeTeam")
+    apiVersion = "1.19"
     prefix = "EternalCombat"
     name = "EternalCombat"
+    generateLibrariesJson = true
     load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
-    softDepend = listOf(
-        "Lands",
-        "WorldGuard"
-    )
-    depend = listOf(
-        "packetevents",
-    )
     version = "${project.version}"
 
     foliaSupported = true
+
+    serverDependencies {
+        register("packetevents") {
+            required = true
+            load = PaperPluginDescription.RelativeLoadOrder.BEFORE
+        }
+
+        register("Lands") {
+            required = false
+            load = PaperPluginDescription.RelativeLoadOrder.BEFORE
+        }
+
+        register("WorldGuard") {
+            required = false
+            load = PaperPluginDescription.RelativeLoadOrder.BEFORE
+        }
+
+        register("GriefPrevention") {
+            required = false
+            load = PaperPluginDescription.RelativeLoadOrder.BEFORE
+        }
+
+        register("PlaceholderAPI") {
+            required = false
+            load = PaperPluginDescription.RelativeLoadOrder.BEFORE
+        }
+    }
 }
 
 tasks {
-    runServer {
-        minecraftVersion("1.21.10")
-        downloadPlugins.modrinth("WorldEdit", Versions.WORLDEDIT)
+    named("generatePaperPluginDescription") {
+        notCompatibleWithConfigurationCache("The plugin-yml paper generator reads Task.project during execution.")
+    }
+
+    runPaper.folia.registerTask {
+        minecraftVersion("26.3")
+
         downloadPlugins.modrinth("PacketEvents", "${Versions.PACKETEVENTS}+spigot")
-        downloadPlugins.modrinth("WorldGuard", Versions.WORLDGUARD)
-        downloadPlugins.modrinth("LuckPerms", "v${Versions.LUCKPERMS}-bukkit")
     }
 }
 
@@ -110,17 +131,18 @@ tasks.shadowJar {
     exclude(
         "org/intellij/lang/annotations/**",
         "org/jetbrains/annotations/**",
+        "net/kyori/**",
         "META-INF/**",
         "kotlin/**",
         "javax/**",
         "org/checkerframework/**",
         "com/google/errorprone/**",
+        "com/google/gson/**"
     )
 
     val prefix = "com.eternalcode.combat.libs"
     listOf(
         "eu.okaeri",
-        "net.kyori",
         "org.bstats",
         "org.yaml",
         "dev.rollczi.litecommands",
@@ -130,59 +152,8 @@ tasks.shadowJar {
         "com.eternalcode.commons",
         "com.eternalcode.multification",
         "com.github.cryptomorin",
-        "io.papermc.lib",
+        "com.cryptomorin",
     ).forEach { pack ->
         relocate(pack, "$prefix.$pack")
     }
 }
-
-val isGithubWorkflow = providers.environmentVariable("GITHUB_RUN_NUMBER").isPresent
-val isRelease = providers.environmentVariable("GITHUB_EVENT_NAME").orNull == "release"
-val isSnapshot = !isRelease
-
-if (isGithubWorkflow && isSnapshot) {
-    val parts = providers.exec { commandLine("git", "describe", "--tags", "--long") }
-        .standardOutput.asText.get().trim()
-        .split("-")
-
-    val offset = if (parts.size >= 3) parts[parts.size - 2] else "0"
-    val baseVersion = project.version.toString().replace("-SNAPSHOT", "")
-    version = "$baseVersion-SNAPSHOT+$offset"
-}
-
-val changelogText = providers.environmentVariable("CHANGELOG")
-    .orElse(providers.exec { commandLine("git", "log", "-1", "--format=%B") }.standardOutput.asText)
-
-val paperVersions = property("paperVersion").toString()
-    .split(",")
-    .map { it.trim() }
-
-val releaseChannel = if (isRelease) "Release" else "Snapshot"
-
-modrinth {
-    token.set(providers.environmentVariable("MODRINTH_TOKEN"))
-    projectId.set("eternalcombat")
-    versionNumber.set(project.version.toString())
-    versionType.set(if (isRelease) "release" else "beta")
-    uploadFile.set(tasks.shadowJar)
-    gameVersions.addAll(paperVersions)
-    loaders.addAll(listOf("paper", "spigot", "folia", "purpur"))
-    changelog.set(changelogText)
-    syncBodyFrom.set(rootProject.file("README.md").readText())
-}
-
-hangarPublish {
-    publications.register("plugin") {
-        version.set(project.version.toString())
-        channel.set(releaseChannel)
-        changelog.set(changelogText)
-        id.set("eternalcombat")
-        apiKey.set(providers.environmentVariable("HANGAR_API_TOKEN"))
-        platforms {
-            register(Platforms.PAPER) {
-                jar.set(tasks.shadowJar.flatMap { it.archiveFile })
-                platformVersions.set(paperVersions)
-            }
-        }
-    }
-}

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

@@ -1,55 +1,67 @@
 package com.eternalcode.combat;
 
-import com.eternalcode.combat.border.BorderTriggerController;
 import com.eternalcode.combat.border.BorderService;
 import com.eternalcode.combat.border.BorderServiceImpl;
+import com.eternalcode.combat.border.BorderTriggerController;
 import com.eternalcode.combat.border.animation.block.BorderBlockController;
 import com.eternalcode.combat.border.animation.particle.ParticleController;
 import com.eternalcode.combat.bridge.BridgeService;
-import com.eternalcode.combat.crystalpvp.RespawnAnchorListener;
-import com.eternalcode.combat.crystalpvp.EndCrystalListener;
+import com.eternalcode.combat.config.ConfigService;
+import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.fight.crystalpvp.EndCrystalController;
+import com.eternalcode.combat.fight.crystalpvp.RespawnAnchorController;
+import com.eternalcode.combat.event.EventManager;
+import com.eternalcode.combat.fight.FightManager;
+import com.eternalcode.combat.fight.FightManagerImpl;
+import com.eternalcode.combat.fight.FightTagCommand;
+import com.eternalcode.combat.fight.FightTask;
+import com.eternalcode.combat.fight.blocker.CommandsBlocker;
+import com.eternalcode.combat.fight.blocker.ElytraBlocker;
+import com.eternalcode.combat.fight.blocker.ElytraEquipBlocker;
+import com.eternalcode.combat.fight.blocker.FlyingBlocker;
 import com.eternalcode.combat.fight.controller.FightBypassAdminController;
 import com.eternalcode.combat.fight.controller.FightBypassCreativeController;
 import com.eternalcode.combat.fight.controller.FightBypassPermissionController;
-import com.eternalcode.combat.fight.controller.FightInventoryController;
-import com.eternalcode.combat.fight.death.DeathFlareController;
-import com.eternalcode.combat.fight.death.DeathLightningController;
-import com.eternalcode.combat.fight.drop.DropKeepInventoryService;
-import com.eternalcode.combat.fight.FightManager;
-import com.eternalcode.combat.fight.drop.DropService;
-import com.eternalcode.combat.fight.effect.FightEffectService;
-import com.eternalcode.combat.fight.firework.FireworkController;
-import com.eternalcode.combat.fight.knockback.KnockbackService;
-import com.eternalcode.combat.fight.tagout.FightTagOutService;
-import com.eternalcode.combat.fight.pearl.FightPearlService;
-import com.eternalcode.combat.handler.InvalidUsageHandlerImpl;
-import com.eternalcode.combat.handler.MissingPermissionHandlerImpl;
-import com.eternalcode.combat.config.ConfigService;
-import com.eternalcode.combat.config.implementation.PluginConfig;
-import com.eternalcode.combat.fight.drop.DropController;
-import com.eternalcode.combat.fight.drop.DropKeepInventoryServiceImpl;
-import com.eternalcode.combat.fight.drop.DropServiceImpl;
-import com.eternalcode.combat.fight.drop.impl.PercentDropModifier;
-import com.eternalcode.combat.fight.drop.impl.PlayersHealthDropModifier;
-import com.eternalcode.combat.fight.FightTagCommand;
-import com.eternalcode.combat.fight.controller.FightActionBlockerController;
+import com.eternalcode.combat.fight.blocker.InventoryContainersBlocker;
 import com.eternalcode.combat.fight.controller.FightMessageController;
 import com.eternalcode.combat.fight.controller.FightTagController;
 import com.eternalcode.combat.fight.controller.FightUnTagController;
+import com.eternalcode.combat.fight.death.DeathFlareController;
+import com.eternalcode.combat.fight.death.DeathLightningController;
+import com.eternalcode.combat.fight.drop.DropController;
+import com.eternalcode.combat.fight.drop.DropKeepInventoryService;
+import com.eternalcode.combat.fight.drop.DropKeepInventoryServiceImpl;
+import com.eternalcode.combat.fight.drop.DropService;
+import com.eternalcode.combat.fight.drop.DropServiceImpl;
+import com.eternalcode.combat.fight.drop.impl.PercentDropModifier;
+import com.eternalcode.combat.fight.drop.impl.PlayersHealthDropModifier;
+import com.eternalcode.combat.fight.blocker.PlaceBlockBlocker;
+import com.eternalcode.combat.fight.blocker.SignEditingBlocker;
 import com.eternalcode.combat.fight.effect.FightEffectController;
-import com.eternalcode.combat.event.EventManager;
-import com.eternalcode.combat.fight.FightManagerImpl;
-import com.eternalcode.combat.fight.FightTask;
+import com.eternalcode.combat.fight.effect.FightEffectService;
 import com.eternalcode.combat.fight.effect.FightEffectServiceImpl;
+import com.eternalcode.combat.fight.firework.FireworkController;
+import com.eternalcode.combat.fight.knockback.KnockbackMountController;
+import com.eternalcode.combat.fight.knockback.KnockbackRegionController;
+import com.eternalcode.combat.fight.knockback.KnockbackService;
 import com.eternalcode.combat.fight.logout.LogoutController;
 import com.eternalcode.combat.fight.logout.LogoutService;
-import com.eternalcode.combat.fight.pearl.FightPearlController;
-import com.eternalcode.combat.fight.pearl.FightPearlServiceImpl;
-import com.eternalcode.combat.fight.tagout.FightTagOutController;
-import com.eternalcode.combat.fight.tagout.FightTagOutServiceImpl;
+import com.eternalcode.combat.fight.pearl.PearlController;
+import com.eternalcode.combat.fight.pearl.PearlService;
+import com.eternalcode.combat.fight.pearl.PearlServiceImpl;
+import com.eternalcode.combat.fight.spear.SpearLungeController;
+import com.eternalcode.combat.fight.spear.SpearService;
+import com.eternalcode.combat.fight.spear.SpearServiceImpl;
 import com.eternalcode.combat.fight.tagout.FightTagOutCommand;
+import com.eternalcode.combat.fight.tagout.FightTagOutController;
+import com.eternalcode.combat.fight.tagout.FightTagOutService;
+import com.eternalcode.combat.fight.tagout.FightTagOutServiceImpl;
+import com.eternalcode.combat.fight.trident.TridentController;
+import com.eternalcode.combat.fight.trident.TridentService;
+import com.eternalcode.combat.fight.trident.TridentServiceImpl;
+import com.eternalcode.combat.handler.InvalidUsageHandlerImpl;
+import com.eternalcode.combat.handler.MissingPermissionHandlerImpl;
 import com.eternalcode.combat.notification.NoticeService;
-import com.eternalcode.combat.fight.knockback.KnockbackRegionController;
 import com.eternalcode.combat.region.RegionProvider;
 import com.eternalcode.combat.updater.UpdaterNotificationController;
 import com.eternalcode.combat.updater.UpdaterService;
@@ -63,8 +75,6 @@ import dev.rollczi.litecommands.bukkit.LiteBukkitFactory;
 import dev.rollczi.litecommands.bukkit.LiteBukkitMessages;
 import dev.rollczi.litecommands.folia.FoliaExtension;
 import java.time.Duration;
-import net.kyori.adventure.platform.AudienceProvider;
-import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Server;
@@ -83,7 +93,8 @@ public final class CombatPlugin extends JavaPlugin implements EternalCombatApi {
     private static final int BSTATS_METRICS_ID = 17803;
 
     private FightManager fightManager;
-    private FightPearlService fightPearlService;
+    private PearlService pearlService;
+    private TridentService tridentService;
     private FightTagOutService fightTagOutService;
     private FightEffectService fightEffectService;
 
@@ -92,8 +103,8 @@ public final class CombatPlugin extends JavaPlugin implements EternalCombatApi {
 
     private RegionProvider regionProvider;
 
-    private AudienceProvider audienceProvider;
     private LiteCommands<CommandSender> liteCommands;
+    private boolean apiInitialized;
 
 
     @Override
@@ -111,7 +122,8 @@ public final class CombatPlugin extends JavaPlugin implements EternalCombatApi {
         MinecraftScheduler scheduler = CombatSchedulerAdapter.getAdaptiveScheduler(this);
 
         this.fightManager = new FightManagerImpl(eventManager);
-        this.fightPearlService = new FightPearlServiceImpl(pluginConfig.pearl);
+        this.pearlService = new PearlServiceImpl(this.fightManager, pluginConfig, scheduler);
+        this.tridentService = new TridentServiceImpl(pluginConfig);
         this.fightTagOutService = new FightTagOutServiceImpl();
         this.fightEffectService = new FightEffectServiceImpl();
 
@@ -122,13 +134,12 @@ public final class CombatPlugin extends JavaPlugin implements EternalCombatApi {
 
         UpdaterService updaterService = new UpdaterService(this.getDescription());
 
-        this.audienceProvider = BukkitAudiences.create(this);
         MiniMessage miniMessage = MiniMessage.builder()
             .postProcessor(new AdventureLegacyColorPostProcessor())
             .preProcessor(new AdventureLegacyColorPreProcessor())
             .build();
 
-        NoticeService noticeService = new NoticeService(this.audienceProvider, pluginConfig, miniMessage);
+        NoticeService noticeService = new NoticeService(pluginConfig, miniMessage);
 
         BridgeService bridgeService = new BridgeService(
             pluginConfig,
@@ -143,6 +154,8 @@ public final class CombatPlugin extends JavaPlugin implements EternalCombatApi {
         BorderService borderService = new BorderServiceImpl(scheduler, server, regionProvider, eventManager, () -> pluginConfig.border);
         KnockbackService knockbackService = new KnockbackService(pluginConfig, scheduler, regionProvider);
 
+        SpearService spearService = new SpearServiceImpl(pluginConfig.spear);
+
         this.liteCommands = LiteBukkitFactory.builder(FALLBACK_PREFIX, this, server)
             .message(LiteBukkitMessages.PLAYER_NOT_FOUND, pluginConfig.messagesSettings.playerNotFound)
             .message(LiteBukkitMessages.PLAYER_ONLY, pluginConfig.messagesSettings.admin.onlyForPlayers)
@@ -181,11 +194,12 @@ public final class CombatPlugin extends JavaPlugin implements EternalCombatApi {
             new FightBypassAdminController(server, pluginConfig),
             new FightBypassPermissionController(server, pluginConfig),
             new FightBypassCreativeController(server, pluginConfig),
-            new FightActionBlockerController(this.fightManager, noticeService, pluginConfig, server),
-            new FightPearlController(pluginConfig.pearl, noticeService, this.fightManager, this.fightPearlService),
+            new PlaceBlockBlocker(this.fightManager, noticeService, pluginConfig),
+            new PearlController(pluginConfig, this.pearlService, noticeService, fightManager),
+            new TridentController(pluginConfig, noticeService, this.fightManager, this.tridentService, server),
             new DeathFlareController(pluginConfig, server, scheduler, this),
             new DeathLightningController(pluginConfig, server),
-            new UpdaterNotificationController(updaterService, pluginConfig, this.audienceProvider, miniMessage),
+            new UpdaterNotificationController(updaterService, pluginConfig, miniMessage),
             new KnockbackRegionController(noticeService, this.regionProvider, this.fightManager, knockbackService, server),
             new FightEffectController(pluginConfig.effect, this.fightEffectService, this.fightManager, server),
             new FightTagOutController(this.fightTagOutService),
@@ -193,12 +207,22 @@ public final class CombatPlugin extends JavaPlugin implements EternalCombatApi {
             new BorderTriggerController(borderService, () -> pluginConfig.border, fightManager, server, scheduler),
             new ParticleController(borderService, () -> pluginConfig.border.particle, scheduler, server),
             new BorderBlockController(borderService, () -> pluginConfig.border.block, scheduler, server),
-            new EndCrystalListener(this, this.fightManager, pluginConfig),
-            new RespawnAnchorListener(this, this.fightManager, pluginConfig),
+            new EndCrystalController(this, this.fightManager, pluginConfig),
+            new RespawnAnchorController(this, this.fightManager, pluginConfig),
             new FireworkController(this.fightManager, pluginConfig, noticeService),
-            new FightInventoryController(this.fightManager, pluginConfig, noticeService)
+            new InventoryContainersBlocker(this.fightManager, pluginConfig, noticeService),
+            new SignEditingBlocker(this.fightManager, pluginConfig),
+            new CommandsBlocker(this.fightManager, noticeService, pluginConfig),
+            new ElytraBlocker(this.fightManager, pluginConfig),
+            new ElytraEquipBlocker(this.fightManager, noticeService, pluginConfig, server),
+            new FlyingBlocker(this.fightManager, pluginConfig, server),
+            new PlaceBlockBlocker(this.fightManager, noticeService, pluginConfig)
         );
 
+        new KnockbackMountController(noticeService, this.regionProvider, this.fightManager).register(this);
+
+        new SpearLungeController(this, fightManager, spearService, pluginConfig, noticeService);
+
         eventManager.subscribe(
             PlayerDeathEvent.class,
             pluginConfig.drop.dropEventPriority,
@@ -212,6 +236,7 @@ public final class CombatPlugin extends JavaPlugin implements EternalCombatApi {
         );
 
         EternalCombatProvider.initialize(this);
+        this.apiInitialized = true;
 
         long millis = started.elapsed(TimeUnit.MILLISECONDS);
         this.getLogger().info("Successfully loaded EternalCombat in " + millis + "ms");
@@ -219,17 +244,18 @@ public final class CombatPlugin extends JavaPlugin implements EternalCombatApi {
 
     @Override
     public void onDisable() {
-        EternalCombatProvider.deinitialize();
-
         if (this.liteCommands != null) {
             this.liteCommands.unregister();
         }
 
-        if (this.audienceProvider != null) {
-            this.audienceProvider.close();
+        if (this.fightManager != null) {
+            this.fightManager.untagAll();
         }
 
-        this.fightManager.untagAll();
+        if (this.apiInitialized) {
+            EternalCombatProvider.deinitialize();
+            this.apiInitialized = false;
+        }
     }
 
     @Override
@@ -243,8 +269,8 @@ public final class CombatPlugin extends JavaPlugin implements EternalCombatApi {
     }
 
     @Override
-    public FightPearlService getFightPearlService() {
-        return this.fightPearlService;
+    public PearlService getFightPearlService() {
+        return this.pearlService;
     }
 
     @Override

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

@@ -8,8 +8,6 @@ import org.bukkit.plugin.Plugin;
 
 public final class CombatSchedulerAdapter {
 
-    private static final String FOLIA_CLASS = "io.papermc.paper.threadedregions.RegionizedServer";
-
     private CombatSchedulerAdapter() {
         throw new UnsupportedOperationException("This is an utility class and cannot be instantiated");
     }
@@ -17,14 +15,12 @@ public final class CombatSchedulerAdapter {
     public static MinecraftScheduler getAdaptiveScheduler(Plugin plugin) {
         Logger logger = plugin.getLogger();
 
-        try {
-            Class.forName(FOLIA_CLASS);
+        if (FoliaChecker.isFolia()) {
             logger.info("» Detected Folia environment. Using FoliaScheduler.");
             return new FoliaSchedulerImpl(plugin);
         }
-        catch (ClassNotFoundException exception) {
-            logger.info("» Detected Bukkit/Paper environment. Using BukkitScheduler.");
-            return new BukkitSchedulerImpl(plugin);
-        }
+
+        logger.info("» Detected Bukkit/Paper environment. Using BukkitScheduler.");
+        return new BukkitSchedulerImpl(plugin);
     }
 }

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

@@ -2,7 +2,6 @@ package com.eternalcode.combat;
 
 import com.eternalcode.combat.config.ConfigService;
 import com.eternalcode.combat.notification.NoticeService;
-import com.eternalcode.multification.bukkit.notice.BukkitNotice;
 import com.eternalcode.multification.notice.Notice;
 import com.google.common.base.Stopwatch;
 import dev.rollczi.litecommands.annotations.async.Async;
@@ -16,7 +15,7 @@ import org.bukkit.command.CommandSender;
 @Command(name = "combatlog", aliases = "combat")
 public class EternalCombatReloadCommand {
 
-    private static final Notice RELOAD_MESSAGE = BukkitNotice.builder()
+    private static final Notice RELOAD_MESSAGE = Notice.builder()
         .chat("<b><gradient:#8a1212:#fc6b03>EternalCombat:</gradient></b> Reloaded EternalCombat in <color:#fce303>{TIME}ms!</color>")
         .build();
 

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

@@ -0,0 +1,25 @@
+package com.eternalcode.combat;
+
+public final class FoliaChecker {
+
+    private static final String FOLIA_CLASS = "io.papermc.paper.threadedregions.RegionizedServer";
+    private static final boolean IS_FOLIA = detectFoliaEnvironment();
+
+    private FoliaChecker() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+
+    public static boolean isFolia() {
+        return IS_FOLIA;
+    }
+
+    private static boolean detectFoliaEnvironment() {
+        try {
+            Class.forName(FOLIA_CLASS);
+            return true;
+        }
+        catch (ClassNotFoundException exception) {
+            return false;
+        }
+    }
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/border/animation/block/ChunkCache.java

@@ -2,7 +2,6 @@ package com.eternalcode.combat.border.animation.block;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import io.papermc.lib.PaperLib;
 import org.bukkit.ChunkSnapshot;
 import org.bukkit.entity.Player;
 
@@ -22,7 +21,7 @@ class ChunkCache {
             return snapshot;
         }
 
-        ChunkSnapshot chunkSnapshot = PaperLib.getChunkAtAsync(player.getWorld(), location.x(), location.z(), false)
+        ChunkSnapshot chunkSnapshot = player.getWorld().getChunkAtAsync(location.x(), location.z(), false)
             .thenApply(chunk -> chunk.getChunkSnapshot())
             .join();
 

eternalcombat-plugin/src/main/java/com/eternalcode/combat/bridge/BridgeService.java

@@ -7,6 +7,7 @@ import com.eternalcode.combat.fight.FightManager;
 import com.eternalcode.combat.region.CompositeRegionProvider;
 import com.eternalcode.combat.region.bukkit.DefaultRegionProvider;
 import com.eternalcode.combat.region.RegionProvider;
+import com.eternalcode.combat.region.griefprevention.GriefPreventionRegionProvider;
 import com.eternalcode.combat.region.worldguard.WorldGuardRegionProvider;
 import java.util.ArrayList;
 import java.util.List;
@@ -55,6 +56,12 @@ public class BridgeService {
             () -> this.logger.warning("WorldGuard not found; skipping WorldGuardRegionProvider.")
         );
 
+        this.initialize(
+            "GriefPrevention",
+            () -> providers.add(new GriefPreventionRegionProvider(this.config)),
+            () -> this.logger.warning("GriefPrevention not found; skipping GriefPreventionRegionProvider.")
+        );
+
         if (providers.isEmpty()) {
             providers.add(new DefaultRegionProvider(this.config.regions.restrictedRegionRadius));
             this.logger.warning("No region plugin found; using DefaultRegionProvider.");

eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/ConfigService.java

@@ -3,9 +3,9 @@ package com.eternalcode.combat.config;
 import com.eternalcode.combat.border.animation.block.BlockTypeTransformer;
 import com.eternalcode.combat.border.animation.particle.ParticleColorTransformer;
 import com.eternalcode.combat.border.animation.particle.ParticleTypeTransformer;
-import com.eternalcode.multification.bukkit.notice.resolver.sound.SoundBukkitResolver;
 import com.eternalcode.multification.notice.resolver.NoticeResolverDefaults;
 import com.eternalcode.multification.notice.resolver.NoticeResolverRegistry;
+import com.eternalcode.multification.notice.resolver.sound.SoundAdventureResolver;
 import com.eternalcode.multification.okaeri.MultificationSerdesPack;
 import eu.okaeri.configs.ConfigManager;
 import eu.okaeri.configs.OkaeriConfig;
@@ -28,7 +28,7 @@ public class ConfigService {
 
         YamlSnakeYamlConfigurer configurer = new YamlSnakeYamlConfigurer();
         NoticeResolverRegistry noticeRegistry = NoticeResolverDefaults.createRegistry()
-            .registerResolver(new SoundBukkitResolver());
+            .registerResolver(new SoundAdventureResolver());
 
         configFile.withConfigurer(configurer,
             new SerdesCommons(),

eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/implementation/CombatSettings.java

@@ -33,6 +33,14 @@ public class CombatSettings extends OkaeriConfig {
     })
     public boolean disableFlying = true;
 
+    @Comment({
+        "# Forcefully unequip elytra when a player enters combat.",
+        "# This prevents players from abusing glide by jumping before being tagged.",
+        "# The elytra will be moved to the player's inventory.",
+        "# Recommended: true"
+    })
+    public boolean unequipElytraOnCombat = true;
+
     @Comment({
         "# Prevent players from boosting themselves while flying with fireworks",
         "# This setting blocks usage of fireworks to boost elytra flight during combat"
@@ -82,6 +90,19 @@ public class CombatSettings extends OkaeriConfig {
     })
     public EventPriority quitPunishmentEventPriority = EventPriority.NORMAL;
 
+    @Comment({
+        "# Keep a player's combat tag continuously active while they are below 'voidCombatHeight'.",
+        "# This prevents players from evading combat by falling into the void (e.g. in the End).",
+        "# Set to 'true' to keep resetting the combat timer to its full duration while below that height."
+    })
+    public boolean keepCombatActiveInVoid = false;
+
+    @Comment({
+        "# The Y height below which the combat timer is kept active (see 'keepCombatActiveInVoid').",
+        "# Default: 0, matching the void threshold in worlds such as the End."
+    })
+    public double voidCombatHeight = 0;
+
     @Comment({
         "# List of kick reasons where players will NOT be punished for combat logging.",
         "# If this list is empty, players are ALWAYS punished when kicked during combat.",

eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/implementation/MessagesSettings.java

@@ -1,6 +1,5 @@
 package com.eternalcode.combat.config.implementation;
 
-import com.eternalcode.multification.bukkit.notice.BukkitNotice;
 import com.eternalcode.multification.notice.Notice;
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.annotation.Comment;
@@ -8,189 +7,207 @@ import eu.okaeri.configs.annotation.Comment;
 public class MessagesSettings extends OkaeriConfig {
 
     @Comment({
-        "# Customize messages related to admin commands and notifications.",
-        "# These messages are displayed to server administrators."
+            "# Customize messages related to admin commands and notifications.",
+            "# These messages are displayed to server administrators."
     })
     public AdminMessages admin = new AdminMessages();
 
     @Comment({
-        " ",
-        "# Configure the combat log notification displayed to players.",
-        "# You can use the {TIME} variable to display the remaining combat time.",
-        " ",
+            " ",
+            "# Configure the combat log notification displayed to players.",
+            "# You can use the {TIME} variable to display the remaining combat time.",
+            "# Placeholder {OPPONENT} will be replaced with player name or 'unknownPlayerPlaceholder' variable",
+            " ",
     })
-    public Notice combatNotification = BukkitNotice.builder()
-        .actionBar("Combat ends in: <red>{TIME}</red>")
-        .build();
+    public Notice combatNotification = Notice.builder()
+            .actionBar("Combat ends in: <red>{TIME}</red>")
+            .build();
 
     @Comment({
-        "# Would you like to display milliseconds instead of seconds in combat notification "
+            "# Would you like to display milliseconds instead of seconds in combat notification "
     })
     public boolean withoutMillis = true;
 
     @Comment({
-        "# Message displayed when a player lacks permission to execute a command.",
-        "# The {PERMISSION} placeholder is replaced with the required permission."
+        " ",
+        "# When player is not known this text will be used as {OPPONENT} in 'combatNotification'"
+    })
+    public String unknownPlayerPlaceholder = "Unknown";
+
+    @Comment({
+            "# Message displayed when a player lacks permission to execute a command.",
+            "# The {PERMISSION} placeholder is replaced with the required permission."
     })
     public Notice noPermission = Notice.chat(
-        "<gradient:red:dark_red>You don't have permission <dark_gray>(<gray>{PERMISSION}</gray>)</dark_gray> to perform this command!</gradient>");
+            "<gradient:red:dark_red>You don't have permission <dark_gray>(<gray>{PERMISSION}</gray>)</dark_gray> to perform this command!</gradient>");
 
     @Comment({
-        "# Message displayed when a specified player is not found.",
-        "# This message is shown when a command targets a player who is not online or does not exist."
+            "# Message displayed when a specified player is not found.",
+            "# This message is shown when a command targets a player who is not online or does not exist."
     })
-    public Notice playerNotFound =
-        Notice.chat("<gradient:#ff0000:#ff6b6b>The specified player could not be found!</gradient>");
+    public Notice playerNotFound = Notice
+            .chat("<gradient:#ff0000:#ff6b6b>The specified player could not be found!</gradient>");
 
     @Comment({
-        "# Message displayed when a player enters combat.",
-        "# This message warns the player not to leave the server while in combat."
+            "# Message displayed when a player enters combat.",
+            "# This message warns the player not to leave the server while in combat.",
+            "# The {OPPONENT} placeholder is replaced with the name of the player who caused the tag,",
+            "# or the 'unknownPlayerPlaceholder' variable if the tag was not caused by a player."
     })
     public Notice playerTagged = Notice.chat(
-        "<gradient:red:yellow>⚠ <white>You are in combat!</white> <u>Do not leave the server!</gradient>");
+            "<gradient:red:yellow>⚠ <white>You are in combat with</white> <yellow>{OPPONENT}</yellow>! <u>Do not leave the server!</gradient>");
 
     @Comment({
-        "# Message displayed when a player leaves combat.",
-        "# This message informs the player that they can safely leave the server."
+            "# Message displayed when a player leaves combat.",
+            "# This message informs the player that they can safely leave the server."
     })
     public Notice playerUntagged = Notice.chat(
-        "<gradient:#00ff00:#00b300>✌ <white>Combat ended!</white> You can now safely leave!</gradient>");
+            "<gradient:#00ff00:#00b300>✌ <white>Combat ended!</white> You can now safely leave!</gradient>");
 
     @Comment({
-        "# Broadcast message displayed when a player logs out during combat.",
-        "# The {PLAYER} placeholder is replaced with the player's name."
+            "# Broadcast message displayed when a player logs out during combat.",
+            "# The {PLAYER} placeholder is replaced with the player's name."
     })
-    public Notice playerLoggedOutDuringCombat =
-        Notice.chat("<gradient:red:dark_red>⚠ <white>{PLAYER}</white> logged off during combat!</gradient>");
+    public Notice playerLoggedOutDuringCombat = Notice
+            .chat("<gradient:red:dark_red>⚠ <white>{PLAYER}</white> logged off during combat!</gradient>");
 
     @Comment({
-        "# Message displayed when a player attempts to use a disabled command during combat.",
-        "# This message informs the player that the command is prohibited while in combat."
+            "# Message displayed when a player attempts to use a disabled command during combat.",
+            "# This message informs the player that the command is prohibited while in combat."
     })
     public Notice commandDisabledDuringCombat = Notice.chat(
-        "<gradient:red:yellow>⚠ <white>Command blocked!</white> Cannot use this during combat!</gradient>");
+            "<gradient:red:yellow>⚠ <white>Command blocked!</white> Cannot use this during combat!</gradient>");
 
     @Comment({
-        "# Message displayed when a player uses a command with incorrect arguments.",
-        "# The {USAGE} placeholder is replaced with the correct command syntax."
+        "# Message displayed when a player attempts to use an elytra during combat.",
+        "# This includes gliding, equipping, or having it forcefully removed.",
+        "# Informs the player that elytra usage is disabled in combat."
+    })
+    public Notice elytraDisabledDuringCombat = Notice.chat(
+        "<gradient:red:yellow>⚠ <white>Elytra disabled!</white> Cannot use elytra during combat!</gradient>"
+    );
+
+    @Comment({
+            "# Message displayed when a player uses a command with incorrect arguments.",
+            "# The {USAGE} placeholder is replaced with the correct command syntax."
     })
     public Notice invalidCommandUsage = Notice.chat("<gray>Usage: <gradient:gold:yellow>{USAGE}</gradient>");
 
     @Comment({
-        "# Message displayed when a player attempts to open their inventory during combat.",
-        "# This message informs the player that inventory access is blocked while in combat."
+            "# Message displayed when a player attempts to open their inventory during combat.",
+            "# This message informs the player that inventory access is blocked while in combat."
     })
     public Notice inventoryBlockedDuringCombat = Notice.chat(
-        "<gradient:red:dark_red>⚠ <white>Inventory access</white> is restricted during combat!</gradient>");
+            "<gradient:red:dark_red>⚠ <white>Inventory access</white> is restricted during combat!</gradient>");
 
     @Comment({
-        "# Message displayed when a player attempts to place a block during combat.",
-        "# The {MODE} placeholder is replaced with the block placement mode (ABOVE/BELOW).",
-        "# The {Y} placeholder is replaced with the Y coordinate set in the config."
+            "# Message displayed when a player attempts to place a block during combat.",
+            "# The {MODE} placeholder is replaced with the block placement mode (ABOVE/BELOW).",
+            "# The {Y} placeholder is replaced with the Y coordinate set in the config."
     })
-    public Notice blockPlacingBlockedDuringCombat =
-        Notice.chat("<gradient:red:yellow>⚠ Block placement <white>{MODE} Y:{Y}</white> is restricted!</gradient>");
+    public Notice blockPlacingBlockedDuringCombat = Notice
+            .chat("<gradient:red:yellow>⚠ Block placement <white>{MODE} Y:{Y}</white> is restricted!</gradient>");
 
     @Comment({
-        "# Message sent to the player using fireworks when fireworks during elytra flight are disabled"
+            "# Message sent to the player using fireworks when fireworks during elytra flight are disabled"
     })
-    public Notice fireworksDisabled = Notice.actionbar("<gradient:red:yellow>⚠ You can't use fireworks during combat ⚠</gradient>");
-    
+    public Notice fireworksDisabled = Notice
+            .actionbar("<gradient:red:yellow>⚠ You can't use fireworks during combat ⚠</gradient>");
+
     @Comment({
-        "# Message displayed when a player attempts to enter a restricted region during combat.",
-        "# This message informs the player that they cannot enter the region while in combat."
+            "# Message displayed when a player attempts to enter a restricted region during combat.",
+            "# This message informs the player that they cannot enter the region while in combat."
     })
     public Notice cantEnterOnRegion = Notice.chat(
-        "<gradient:red:dark_red>⚠ Restricted area!</gradient> <white>Cannot enter during combat!</white>");
+            "<gradient:red:dark_red>⚠ Restricted area!</gradient> <white>Cannot enter during combat!</white>");
 
     public static class AdminMessages extends OkaeriConfig {
         @Comment({
-            "# Message displayed when the console attempts to use a player-only command.",
-            "# This message informs the console that the command is not available for non-players."
+                "# Message displayed when the console attempts to use a player-only command.",
+                "# This message informs the console that the command is not available for non-players."
         })
-        public Notice onlyForPlayers =
-            Notice.chat("<gradient:red:dark_red>❌ This command is player-only!</gradient>");
+        public Notice onlyForPlayers = Notice.chat("<gradient:red:dark_red>❌ This command is player-only!</gradient>");
 
         @Comment({
-            "# Message displayed to an admin when they tag a player.",
-            "# The {PLAYER} placeholder is replaced with the tagged player's name."
+                "# Message displayed to an admin when they tag a player.",
+                "# The {PLAYER} placeholder is replaced with the tagged player's name."
         })
-        public Notice adminTagPlayer =
-            Notice.chat("<gradient:#00b3ff:#0066ff>⚔ <gray>Tagged player:</gray> <white>{PLAYER}</white></gradient>");
+        public Notice adminTagPlayer = Notice
+                .chat("<gradient:#00b3ff:#0066ff>⚔ <gray>Tagged player:</gray> <white>{PLAYER}</white></gradient>");
 
         @Comment({
-            "# Message displayed when an admin tags multiple players.",
-            "# The {FIRST_PLAYER} and {SECOND_PLAYER} placeholders are replaced with the players' names."
+                "# Message displayed when an admin tags multiple players.",
+                "# The {FIRST_PLAYER} and {SECOND_PLAYER} placeholders are replaced with the players' names."
         })
         public Notice adminTagMultiplePlayers = Notice.chat(
-            "<gradient:#00b3ff:#0066ff>⚔ <gray>Tagged:</gray> <white>{FIRST_PLAYER}</white> <gray>and</gray> <white>{SECOND_PLAYER}</white></gradient>");
+                "<gradient:#00b3ff:#0066ff>⚔ <gray>Tagged:</gray> <white>{FIRST_PLAYER}</white> <gray>and</gray> <white>{SECOND_PLAYER}</white></gradient>");
 
         @Comment({
-            "# Message displayed to an admin when they remove a player from combat.",
-            "# The {PLAYER} placeholder is replaced with the player's name."
+                "# Message displayed to an admin when they remove a player from combat.",
+                "# The {PLAYER} placeholder is replaced with the player's name."
         })
         public Notice adminUntagPlayer = Notice.chat(
-            "<gradient:#00ff88:#00b300>✌ <gray>Removed</gray> <white>{PLAYER}</white> <gray>from combat</gray></gradient>");
+                "<gradient:#00ff88:#00b300>✌ <gray>Removed</gray> <white>{PLAYER}</white> <gray>from combat</gray></gradient>");
 
         @Comment({
-            "# Message displayed to an admin when they remove a player from combat.",
-            "# The {PLAYER} placeholder is replaced with the player's name."
+                "# Message displayed to an admin when they remove a player from combat.",
+                "# The {PLAYER} placeholder is replaced with the player's name."
         })
         public Notice adminUntagAll = Notice.chat(
-            "<gradient:#00ff88:#00b300>✌ <gray>Removed</gray> <white>{COUNT}</white> <gray> players from combat</gray></gradient>");
+                "<gradient:#00ff88:#00b300>✌ <gray>Removed</gray> <white>{COUNT}</white> <gray> players from combat</gray></gradient>");
 
         @Comment({
-            "# Message displayed when an admin attempts to untag a player who is not in combat.",
-            "# This message informs the admin that the player is not currently in combat."
+                "# Message displayed when an admin attempts to untag a player who is not in combat.",
+                "# This message informs the admin that the player is not currently in combat."
         })
-        public Notice adminPlayerNotInCombat =
-            Notice.chat("<gradient:red:dark_red>❌ <white>{PLAYER}</white> is not in combat!</gradient>");
+        public Notice adminPlayerNotInCombat = Notice
+                .chat("<gradient:red:dark_red>❌ <white>{PLAYER}</white> is not in combat!</gradient>");
 
         @Comment({
-            "# Message displayed when a player is in combat.",
-            "# The {PLAYER} placeholder is replaced with the player's name."
+                "# Message displayed when a player is in combat.",
+                "# The {PLAYER} placeholder is replaced with the player's name."
         })
-        public Notice playerInCombat =
-            Notice.chat("<gradient:#ff6666:#ff0000>⚔ <white>{PLAYER}</white> <gray>is in combat!</gray></gradient>");
+        public Notice playerInCombat = Notice
+                .chat("<gradient:#ff6666:#ff0000>⚔ <white>{PLAYER}</white> <gray>is in combat!</gray></gradient>");
 
         @Comment({
-            "# Message displayed when a player is not in combat.",
-            "# The {PLAYER} placeholder is replaced with the player's name."
+                "# Message displayed when a player is not in combat.",
+                "# The {PLAYER} placeholder is replaced with the player's name."
         })
-        public Notice playerNotInCombat =
-            Notice.chat("<gradient:#00ff00:#00b300>✌ <white>{PLAYER}</white> <gray>is safe</gray></gradient>");
+        public Notice playerNotInCombat = Notice
+                .chat("<gradient:#00ff00:#00b300>✌ <white>{PLAYER}</white> <gray>is safe</gray></gradient>");
 
         @Comment({
-            "# Message displayed when an admin attempts to tag themselves.",
-            "# This message informs the admin that they cannot tag themselves."
+                "# Message displayed when an admin attempts to tag themselves.",
+                "# This message informs the admin that they cannot tag themselves."
         })
         public Notice adminCannotTagSelf = Notice.chat("<gradient:red:dark_red>❌ Cannot tag yourself!</gradient>");
 
         @Comment({
-            "# Message displayed when an admin disables combat tagging for themselves.",
-            "# The {TIME} placeholder is replaced with the remaining fight time."
+                "# Message displayed when an admin disables combat tagging for themselves.",
+                "# The {TIME} placeholder is replaced with the remaining fight time."
         })
         public Notice adminTagOutSelf = Notice.chat(
-            "<gradient:#00b3ff:#0066ff>🛡 <gray>Self-protection active for</gray> <white>{TIME}</white></gradient>");
+                "<gradient:#00b3ff:#0066ff>🛡 <gray>Self-protection active for</gray> <white>{TIME}</white></gradient>");
 
         @Comment({
-            "# Message displayed when an admin disables combat tagging for another player.",
-            "# The {PLAYER} placeholder is replaced with the player's name.",
-            "# The {TIME} placeholder is replaced with the remaining fight time."
+                "# Message displayed when an admin disables combat tagging for another player.",
+                "# The {PLAYER} placeholder is replaced with the player's name.",
+                "# The {TIME} placeholder is replaced with the remaining fight time."
         })
         public Notice adminTagOut = Notice.chat(
-            "<gradient:#00b3ff:#0066ff>🛡 <gray>Protected</gray> <white>{PLAYER}</white> <gray>for</gray> <white>{TIME}</white></gradient>");
+                "<gradient:#00b3ff:#0066ff>🛡 <gray>Protected</gray> <white>{PLAYER}</white> <gray>for</gray> <white>{TIME}</white></gradient>");
 
         @Comment({
-            "# Message displayed to a player when their combat tagging is disabled.",
-            "# The {TIME} placeholder is replaced with the remaining fight time."
+                "# Message displayed to a player when their combat tagging is disabled.",
+                "# The {TIME} placeholder is replaced with the remaining fight time."
         })
         public Notice playerTagOut = Notice.chat(
-            "<gradient:#00ff88:#00b300>🛡 <gray>Protection active for</gray> <white>{TIME}</white></gradient>");
+                "<gradient:#00ff88:#00b300>🛡 <gray>Protection active for</gray> <white>{TIME}</white></gradient>");
 
         @Comment({
-            "# Message displayed when an admin reenables combat tagging for a player.",
-            "# The {PLAYER} placeholder is replaced with the player's name."
+                "# Message displayed when an admin reenables combat tagging for a player.",
+                "# The {PLAYER} placeholder is replaced with the player's name."
         })
         public Notice adminTagOutOff = Notice.chat(
             "<gradient:#00ff88:#00b300>✌ <gray>Re-enabled tagging for</gray> <white>{PLAYER}</white></gradient>");
@@ -205,7 +222,14 @@ public class MessagesSettings extends OkaeriConfig {
             "# Message displayed when an admin attempts to tag a player who has tag-out enabled.",
             "# This message informs the admin that the player cannot be tagged at this time."
         })
-        public Notice adminTagOutCanceled =
-            Notice.chat("<gradient:red:dark_red>❌ Player has tag-out protection!</gradient>");
+        public Notice adminTagOutCanceled = Notice
+                .chat("<gradient:red:dark_red>❌ Player has tag-out protection!</gradient>");
+
+        @Comment({
+                "# Message displayed when an admin checks combat statistics.",
+                "# The {COUNT} placeholder is replaced with the number of players currently in combat."
+        })
+        public Notice combatStats = Notice
+                .chat("<gradient:#ff6666:#ff0000>⚔ <gray>Players in combat:</gray> <white>{COUNT}</white></gradient>");
     }
 }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/implementation/PluginConfig.java

@@ -5,7 +5,9 @@ import com.eternalcode.combat.fight.death.DeathSettings;
 import com.eternalcode.combat.fight.drop.DropSettings;
 import com.eternalcode.combat.fight.effect.FightEffectSettings;
 import com.eternalcode.combat.fight.knockback.KnockbackSettings;
-import com.eternalcode.combat.fight.pearl.FightPearlSettings;
+import com.eternalcode.combat.fight.pearl.PearlSettings;
+import com.eternalcode.combat.fight.spear.SpearSettings;
+import com.eternalcode.combat.fight.trident.TridentSettings;
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.annotation.Comment;
 import java.time.Duration;
@@ -34,7 +36,21 @@ public class PluginConfig extends OkaeriConfig {
         "# Settings related to Ender Pearls.",
         "# Configure cooldowns, restrictions, and other behaviors for Ender Pearls during combat."
     })
-    public FightPearlSettings pearl = new FightPearlSettings();
+    public PearlSettings pearl = new PearlSettings();
+
+    @Comment({
+        " ",
+        "# Settings related to Trident",
+        "# Configure cooldowns, restrictions, and other behaviors for Trident during combat."
+    })
+    public TridentSettings trident = new TridentSettings();
+
+    @Comment({
+        " ",
+        "# Settings related to Spears with lunge",
+        "# Set cooldown for spear lunging"
+    })
+    public SpearSettings spear = new SpearSettings();
 
     @Comment({
         " ",
@@ -119,6 +135,13 @@ public class PluginConfig extends OkaeriConfig {
     })
     public InventorySettings inventory = new InventorySettings();
 
+    @Comment({
+        " ",
+        "# Settings related to sign editing during combat.",
+        "# Created for sign traps where opening the sign editor can block ender pearl throws."
+    })
+    public SignEditingSettings signEditing = new SignEditingSettings();
+
     @Comment({
         " ",
         "# Settings related to placeholders used in the plugin.",

eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/implementation/RegionSettings.java

@@ -13,7 +13,8 @@ public class RegionSettings extends OkaeriConfig {
     public List<String> blockedRegions = Collections.singletonList("your_region");
 
     @Comment({
-        "# Prevent players from entering regions where PVP is disabled by WorldGuard.",
+        "# Prevent players from entering regions where PVP is disabled by the region plugin",
+        "# (WorldGuard PVP flag, GriefPrevention no-combat-in-claims settings).",
         "# Set to 'true' to enforce this restriction, or 'false' to allow PVP in all regions."
     })
     public boolean preventPvpInRegions = true;

eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/implementation/SignEditingSettings.java

@@ -0,0 +1,13 @@
+package com.eternalcode.combat.config.implementation;
+
+import eu.okaeri.configs.OkaeriConfig;
+import eu.okaeri.configs.annotation.Comment;
+
+public class SignEditingSettings extends OkaeriConfig {
+
+    @Comment({
+        "# Prevent players from editing signs during combat.",
+        "# Disabled by default; created for sign traps where sign editing blocks ender pearl throws."
+    })
+    public boolean disableSignEditingDuringCombat = false;
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/FightManagerImpl.java

@@ -55,7 +55,7 @@ public class FightManagerImpl implements FightManager {
     @ApiStatus.Experimental
     @Override
     public FightTagEvent tag(UUID target, Duration delay, CauseOfTag causeOfTag, @Nullable UUID tagger) {
-        FightTagEvent event = this.eventManager.publishEvent(new FightTagEvent(target, causeOfTag));
+        FightTagEvent event = this.eventManager.publishEvent(new FightTagEvent(target, causeOfTag, tagger));
 
         if (event.isCancelled()) {
             return event;

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/FightTagCommand.java

@@ -16,10 +16,8 @@ import dev.rollczi.litecommands.annotations.permission.Permission;
 import dev.rollczi.litecommands.annotations.priority.Priority;
 import dev.rollczi.litecommands.annotations.priority.PriorityValue;
 import java.time.Duration;
-import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
-
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -49,7 +47,6 @@ public class FightTagCommand {
             .placeholder("{PLAYER}", target.getName())
             .viewer(sender)
             .send();
-
     }
 
     @Execute(name = "tag")
@@ -74,7 +71,6 @@ public class FightTagCommand {
             .placeholder("{PLAYER}", target.getName())
             .viewer(sender)
             .send();
-
     }
 
     @Execute(name = "tag")
@@ -122,7 +118,6 @@ public class FightTagCommand {
             .placeholder("{SECOND_PLAYER}", secondTarget.getName())
             .viewer(sender)
             .send();
-
     }
 
     @Execute(name = "untag")
@@ -144,7 +139,6 @@ public class FightTagCommand {
             return;
         }
 
-
         this.noticeService.create()
             .notice(this.config.messagesSettings.admin.adminUntagPlayer)
             .placeholder("{PLAYER}", target.getName())
@@ -169,13 +163,28 @@ public class FightTagCommand {
             .send();
     }
 
-    private void tagoutReasonHandler(CommandSender sender, CancelTagReason cancelReason, MessagesSettings messagesSettings) {
+    @Execute(name = "stats")
+    @Permission("eternalcombat.stats")
+    void stats(@Context CommandSender sender) {
+        long activeCombatPlayers = this.fightManager.getFights().stream()
+            .filter(fightTag -> !fightTag.isExpired())
+            .count();
+
+        this.noticeService.create()
+            .notice(this.config.messagesSettings.admin.combatStats)
+            .placeholder("{COUNT}", String.valueOf(activeCombatPlayers))
+            .viewer(sender)
+            .send();
+    }
+
+    private void tagoutReasonHandler(
+        CommandSender sender, CancelTagReason cancelReason,
+        MessagesSettings messagesSettings) {
         if (cancelReason == CancelTagReason.TAGOUT) {
             this.noticeService.create()
                 .notice(messagesSettings.admin.adminTagOutCanceled)
                 .viewer(sender)
                 .send();
-
         }
     }
 }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/FightTask.java

@@ -1,9 +1,12 @@
 package com.eternalcode.combat.fight;
 
 import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.fight.event.CauseOfTag;
 import com.eternalcode.combat.fight.event.CauseOfUnTag;
+import com.eternalcode.combat.fight.event.FightTagEvent;
 import com.eternalcode.combat.notification.NoticeService;
 import com.eternalcode.combat.util.DurationUtil;
+import java.util.Optional;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
@@ -17,7 +20,7 @@ public class FightTask implements Runnable {
     private final FightManager fightManager;
     private final NoticeService noticeService;
 
-    public FightTask(Server server, PluginConfig config, FightManager fightManager,  NoticeService noticeService) {
+    public FightTask(Server server, PluginConfig config, FightManager fightManager, NoticeService noticeService) {
         this.server = server;
         this.config = config;
         this.fightManager = fightManager;
@@ -40,12 +43,29 @@ public class FightTask implements Runnable {
                 return;
             }
 
+            if (this.config.combat.keepCombatActiveInVoid
+                && player.getLocation().getY() < this.config.combat.voidCombatHeight
+                && !this.config.settings.ignoredWorlds.contains(player.getWorld().getName())) {
+                FightTagEvent tagEvent = this.fightManager.tag(playerUniqueId, this.config.settings.combatTimerDuration, CauseOfTag.VOID, fightTag.getTagger());
+
+                if (!tagEvent.isCancelled()) {
+                    fightTag = this.fightManager.getTag(playerUniqueId);
+                }
+            }
+
             Duration remaining = fightTag.getRemainingDuration();
 
+            String opponent = Optional.ofNullable(fightTag.getTagger())
+                .filter(uuid -> !uuid.equals(playerUniqueId))
+                .map(this.server::getPlayer)
+                .map(Player::getName)
+                .orElse(this.config.messagesSettings.unknownPlayerPlaceholder);
+
             this.noticeService.create()
                 .player(player.getUniqueId())
                 .notice(this.config.messagesSettings.combatNotification)
                 .placeholder("{TIME}", DurationUtil.format(remaining, this.config.messagesSettings.withoutMillis))
+                .placeholder("{OPPONENT}", opponent)
                 .send();
 
         }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/blocker/CommandsBlocker.java

@@ -0,0 +1,54 @@
+package com.eternalcode.combat.fight.blocker;
+
+import com.eternalcode.combat.WhitelistBlacklistMode;
+import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.fight.FightManager;
+import com.eternalcode.combat.notification.NoticeService;
+import java.util.UUID;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.util.StringUtil;
+
+public class CommandsBlocker implements Listener {
+
+    private final FightManager fightManager;
+    private final NoticeService noticeService;
+    private final PluginConfig config;
+
+    public CommandsBlocker(FightManager fightManager, NoticeService noticeService, PluginConfig config) {
+        this.fightManager = fightManager;
+        this.noticeService = noticeService;
+        this.config = config;
+    }
+
+    @EventHandler
+    void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
+        Player player = event.getPlayer();
+        UUID playerUniqueId = player.getUniqueId();
+
+        if (!this.fightManager.isInCombat(playerUniqueId)) {
+            return;
+        }
+
+        String command = event.getMessage().substring(1);
+
+        boolean isAnyMatch = this.config.commands.restrictedCommands.stream()
+            .anyMatch(restrictedCommand -> StringUtil.startsWithIgnoreCase(command, restrictedCommand));
+
+        WhitelistBlacklistMode mode = this.config.commands.commandRestrictionMode;
+
+        boolean shouldCancel = mode.shouldBlock(isAnyMatch);
+
+        if (shouldCancel) {
+            event.setCancelled(true);
+            this.noticeService.create()
+                .player(playerUniqueId)
+                .notice(this.config.messagesSettings.commandDisabledDuringCombat)
+                .send();
+
+        }
+    }
+
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/blocker/ElytraBlocker.java

@@ -0,0 +1,105 @@
+package com.eternalcode.combat.fight.blocker;
+
+import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.fight.FightManager;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.time.Duration;
+import java.util.UUID;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityToggleGlideEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+
+public class ElytraBlocker implements Listener {
+
+    private final FightManager fightManager;
+    private final PluginConfig config;
+    private final Cache<UUID, Boolean> fallProtection = Caffeine.newBuilder()
+        .expireAfterWrite(Duration.ofSeconds(10))
+        .build();
+
+    public ElytraBlocker(FightManager fightManager, PluginConfig config) {
+        this.fightManager = fightManager;
+        this.config = config;
+    }
+
+    @EventHandler
+    void onToggleGlide(EntityToggleGlideEvent event) {
+        if (!this.config.combat.disableElytraUsage) {
+            return;
+        }
+
+        if (!(event.getEntity() instanceof Player player)) {
+            return;
+        }
+        UUID uniqueId = player.getUniqueId();
+
+        if (!this.fightManager.isInCombat(uniqueId)) {
+            return;
+        }
+
+        if (event.isGliding()) {
+            event.setCancelled(true);
+            player.setGliding(false);
+        }
+    }
+
+
+    @EventHandler
+    void onMoveWhileGliding(PlayerMoveEvent event) {
+        if (!this.config.combat.disableElytraUsage) {
+            return;
+        }
+
+        Player player = event.getPlayer();
+        UUID uniqueId = player.getUniqueId();
+
+        if (!this.fightManager.isInCombat(uniqueId)) {
+            return;
+        }
+
+        if (player.isGliding()) {
+            player.setGliding(false);
+
+            player.setVelocity(player.getVelocity().setY(-10));
+            player.setFallDistance(0f);
+            fallProtection.put(uniqueId, true);
+
+        }
+    }
+
+    @EventHandler
+    public void onEntityDamage(EntityDamageEvent event) {
+        if (!(event.getEntity() instanceof Player player)) {
+            return;
+        }
+
+        if (event.getCause() != EntityDamageEvent.DamageCause.FALL) {
+            return;
+        }
+
+        if (fallProtection.get(player.getUniqueId(), key -> false)) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler
+    void onDamage(EntityDamageEvent event) {
+        if (!this.config.combat.disableElytraOnDamage) {
+            return;
+        }
+
+        if (!(event.getEntity() instanceof Player player)) {
+            return;
+        }
+        UUID uniqueId = player.getUniqueId();
+
+        if (this.fightManager.isInCombat(uniqueId) && player.isGliding()) {
+            player.setGliding(false);
+        }
+    }
+
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/blocker/ElytraEquipBlocker.java

@@ -0,0 +1,132 @@
+package com.eternalcode.combat.fight.blocker;
+
+import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.fight.FightManager;
+import com.eternalcode.combat.fight.event.FightTagEvent;
+import com.eternalcode.combat.notification.NoticeService;
+import java.util.HashMap;
+import java.util.UUID;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
+
+public class ElytraEquipBlocker implements Listener {
+
+    private final FightManager fightManager;
+    private final NoticeService noticeService;
+    private final PluginConfig config;
+    private final Server server;
+
+    public ElytraEquipBlocker(FightManager fightManager, NoticeService noticeService, PluginConfig config, Server server) {
+        this.fightManager = fightManager;
+        this.noticeService = noticeService;
+        this.config = config;
+        this.server = server;
+    }
+
+    @EventHandler
+    void onInventoryClick(InventoryClickEvent event) {
+        if (!(event.getWhoClicked() instanceof Player player)) {
+            return;
+        }
+
+        if (!this.config.combat.unequipElytraOnCombat) {
+            return;
+        }
+
+        UUID uniqueId = player.getUniqueId();
+
+        if (!this.fightManager.isInCombat(uniqueId)) {
+            return;
+        }
+
+        if (event.getCurrentItem() == null) {
+            return;
+        }
+
+        if (event.getCurrentItem().getType() == Material.ELYTRA) {
+            event.setCancelled(true);
+
+            this.noticeService.create()
+                .player(uniqueId)
+                .notice(this.config.messagesSettings.elytraDisabledDuringCombat)
+                .send();
+        }
+    }
+
+
+    @EventHandler
+    void onTag(FightTagEvent event) {
+        UUID uniqueId = event.getPlayer();
+        Player player = this.server.getPlayer(uniqueId);
+
+        if (player == null) {
+            return;
+        }
+
+        if (this.config.combat.unequipElytraOnCombat) {
+            ItemStack chest = player.getInventory().getChestplate();
+
+            if (chest != null && chest.getType() == Material.ELYTRA) {
+                removeChestplateIfElytra(player);
+
+                this.noticeService.create()
+                    .player(uniqueId)
+                    .notice(this.config.messagesSettings.elytraDisabledDuringCombat)
+                    .send();
+            }
+        }
+    }
+
+    private void removeChestplateIfElytra(Player player) {
+        ItemStack chestplate = player.getInventory().getChestplate();
+
+        if (chestplate != null && chestplate.getType() == Material.ELYTRA) {
+            player.getInventory().setChestplate(null);
+
+            HashMap<Integer, ItemStack> leftover = player.getInventory().addItem(chestplate);
+            leftover.values().forEach(item ->
+                player.getWorld().dropItemNaturally(player.getLocation(), item)
+            );
+        }
+    }
+
+    @EventHandler
+    void onInteract(PlayerInteractEvent event) {
+        if (!this.config.combat.unequipElytraOnCombat) {
+            return;
+        }
+
+        if (event.getItem() == null) {
+            return;
+        }
+
+        if (event.getItem().getType() != Material.ELYTRA) {
+            return;
+        }
+
+        Player player = event.getPlayer();
+        UUID uniqueId = player.getUniqueId();
+
+        if (!this.fightManager.isInCombat(uniqueId)) {
+            return;
+        }
+
+        switch (event.getAction()) {
+            case RIGHT_CLICK_AIR, RIGHT_CLICK_BLOCK -> {
+                event.setCancelled(true);
+
+                this.noticeService.create()
+                    .player(uniqueId)
+                    .notice(this.config.messagesSettings.elytraDisabledDuringCombat)
+                    .send();
+            }
+        }
+    }
+
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/blocker/FlyingBlocker.java

@@ -0,0 +1,86 @@
+package com.eternalcode.combat.fight.blocker;
+
+import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.fight.FightManager;
+import com.eternalcode.combat.fight.event.FightTagEvent;
+import com.eternalcode.combat.fight.event.FightUntagEvent;
+import java.util.UUID;
+import org.bukkit.GameMode;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerToggleFlightEvent;
+
+public class FlyingBlocker implements Listener {
+
+    private final FightManager fightManager;
+    private final PluginConfig config;
+    private final Server server;
+
+    public FlyingBlocker(FightManager fightManager, PluginConfig config, Server server) {
+        this.fightManager = fightManager;
+        this.config = config;
+        this.server = server;
+    }
+
+
+    @EventHandler
+    void onFly(PlayerToggleFlightEvent event) {
+        if (!this.config.combat.disableFlying) {
+            return;
+        }
+
+        Player player = event.getPlayer();
+        UUID uniqueId = player.getUniqueId();
+
+        if (!this.fightManager.isInCombat(uniqueId)) {
+            return;
+        }
+
+        if (event.isFlying()) {
+            player.setAllowFlight(false);
+
+            event.setCancelled(true);
+        }
+    }
+
+
+    @EventHandler
+    void onTag(FightTagEvent event) {
+        UUID uniqueId = event.getPlayer();
+        Player player = this.server.getPlayer(uniqueId);
+
+        if (player == null) {
+            return;
+        }
+
+        if (this.config.combat.disableFlying) {
+            GameMode gameMode = player.getGameMode();
+
+            if (gameMode != GameMode.CREATIVE && gameMode != GameMode.SPECTATOR) {
+                player.setAllowFlight(false);
+                player.setFlying(false);
+            }
+        }
+    }
+
+    @EventHandler
+    void onUnTag(FightUntagEvent event) {
+        if (!this.config.combat.disableFlying) {
+            return;
+        }
+
+        UUID uniqueId = event.getPlayer();
+        Player player = this.server.getPlayer(uniqueId);
+
+        if (player == null) {
+            return;
+        }
+        GameMode playerGameMode = player.getGameMode();
+        if (playerGameMode == GameMode.CREATIVE || playerGameMode == GameMode.SPECTATOR) {
+            player.setAllowFlight(true);
+        }
+    }
+
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/blocker/InventoryContainersBlocker.java

@@ -1,4 +1,4 @@
-package com.eternalcode.combat.fight.controller;
+package com.eternalcode.combat.fight.blocker;
 
 import com.eternalcode.combat.config.implementation.PluginConfig;
 import com.eternalcode.combat.fight.FightManager;
@@ -10,13 +10,13 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.inventory.InventoryType;
 
-public class FightInventoryController implements Listener {
+public class InventoryContainersBlocker implements Listener {
 
     private final FightManager fightManager;
     private final PluginConfig config;
     private final NoticeService noticeService;
 
-    public FightInventoryController(FightManager fightManager, PluginConfig config, NoticeService noticeService) {
+    public InventoryContainersBlocker(FightManager fightManager, PluginConfig config, NoticeService noticeService) {
         this.fightManager = fightManager;
         this.config = config;
         this.noticeService = noticeService;

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/blocker/PlaceBlockBlocker.java

@@ -0,0 +1,81 @@
+package com.eternalcode.combat.fight.blocker;
+
+import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.config.implementation.BlockPlacementSettings;
+import com.eternalcode.combat.fight.FightManager;
+import com.eternalcode.combat.notification.NoticeService;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockPlaceEvent;
+
+import java.util.List;
+import java.util.UUID;
+
+public class PlaceBlockBlocker implements Listener {
+
+    private final FightManager fightManager;
+    private final NoticeService noticeService;
+    private final PluginConfig config;
+
+    public PlaceBlockBlocker(FightManager fightManager, NoticeService noticeService, PluginConfig config) {
+        this.fightManager = fightManager;
+        this.noticeService = noticeService;
+        this.config = config;
+    }
+
+    @EventHandler
+    void onPlace(BlockPlaceEvent event) {
+        if (!this.config.blockPlacement.disableBlockPlacing) {
+            return;
+        }
+
+        Player player = event.getPlayer();
+        UUID uniqueId = player.getUniqueId();
+
+        if (!this.fightManager.isInCombat(uniqueId)) {
+            return;
+        }
+
+        Block block = event.getBlock();
+        int level = block.getY();
+
+        List<Material> specificBlocksToPreventPlacing = this.config.blockPlacement.restrictedBlockTypes;
+
+        boolean isPlacementBlocked = this.isPlacementBlocked(level);
+
+        if (isPlacementBlocked && specificBlocksToPreventPlacing.isEmpty()) {
+            event.setCancelled(true);
+            this.noticeService.create()
+                .player(uniqueId)
+                .notice(this.config.messagesSettings.blockPlacingBlockedDuringCombat)
+                .placeholder("{Y}", String.valueOf(this.config.blockPlacement.blockPlacementYCoordinate))
+                .placeholder("{MODE}", this.config.blockPlacement.blockPlacementModeDisplayName)
+                .send();
+
+        }
+
+        Material blockMaterial = block.getType();
+        boolean isBlockInDisabledList = specificBlocksToPreventPlacing.contains(blockMaterial);
+        if (isPlacementBlocked && isBlockInDisabledList) {
+            event.setCancelled(true);
+
+            this.noticeService.create()
+                .player(uniqueId)
+                .notice(this.config.messagesSettings.blockPlacingBlockedDuringCombat)
+                .placeholder("{Y}", String.valueOf(this.config.blockPlacement.blockPlacementYCoordinate))
+                .placeholder("{MODE}", this.config.blockPlacement.blockPlacementModeDisplayName)
+                .send();
+
+        }
+    }
+
+    private boolean isPlacementBlocked(int level) {
+        return this.config.blockPlacement.blockPlacementMode == BlockPlacementSettings.BlockPlacingMode.ABOVE
+            ? level > this.config.blockPlacement.blockPlacementYCoordinate
+            : level < this.config.blockPlacement.blockPlacementYCoordinate;
+    }
+
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/blocker/SignEditingBlocker.java

@@ -0,0 +1,63 @@
+package com.eternalcode.combat.fight.blocker;
+
+import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.fight.FightManager;
+import java.util.UUID;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Event.Result;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
+
+public class SignEditingBlocker implements Listener {
+
+    private final FightManager fightManager;
+    private final PluginConfig config;
+
+    public SignEditingBlocker(FightManager fightManager, PluginConfig config) {
+        this.fightManager = fightManager;
+        this.config = config;
+    }
+
+    @EventHandler(ignoreCancelled = true)
+    void onInteract(PlayerInteractEvent event) {
+        if (!this.config.signEditing.disableSignEditingDuringCombat) {
+            return;
+        }
+
+        if (event.getAction() != Action.RIGHT_CLICK_BLOCK) {
+            return;
+        }
+
+        Block clickedBlock = event.getClickedBlock();
+        if (clickedBlock == null || !isSign(clickedBlock.getType())) {
+            return;
+        }
+
+        Player player = event.getPlayer();
+        UUID uniqueId = player.getUniqueId();
+
+        if (!this.fightManager.isInCombat(uniqueId)) {
+            return;
+        }
+
+        event.setUseInteractedBlock(Result.DENY);
+
+        ItemStack item = event.getItem();
+        if (item != null && isEnderPearl(item.getType()) && event.useItemInHand() != Result.DENY) {
+            event.setUseItemInHand(Result.ALLOW);
+        }
+    }
+
+    static boolean isSign(Material material) {
+        return material.name().endsWith("_SIGN");
+    }
+
+    static boolean isEnderPearl(Material material) {
+        return material == Material.ENDER_PEARL;
+    }
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightActionBlockerController.java

@@ -1,216 +0,0 @@
-package com.eternalcode.combat.fight.controller;
-
-import com.eternalcode.combat.config.implementation.PluginConfig;
-import com.eternalcode.combat.WhitelistBlacklistMode;
-import com.eternalcode.combat.config.implementation.BlockPlacementSettings;
-import com.eternalcode.combat.fight.FightManager;
-import com.eternalcode.combat.fight.event.FightUntagEvent;
-import com.eternalcode.combat.notification.NoticeService;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.Server;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityToggleGlideEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerToggleFlightEvent;
-
-import java.util.List;
-import java.util.UUID;
-import org.bukkit.util.StringUtil;
-
-public class FightActionBlockerController implements Listener {
-
-    private final FightManager fightManager;
-    private final NoticeService noticeService;
-    private final PluginConfig config;
-    private final Server server;
-
-    public FightActionBlockerController(FightManager fightManager, NoticeService noticeService, PluginConfig config, Server server) {
-        this.fightManager = fightManager;
-        this.noticeService = noticeService;
-        this.config = config;
-        this.server = server;
-    }
-
-    @EventHandler
-    void onPlace(BlockPlaceEvent event) {
-        if (!this.config.blockPlacement.disableBlockPlacing) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-        UUID uniqueId = player.getUniqueId();
-
-        if (!this.fightManager.isInCombat(uniqueId)) {
-            return;
-        }
-
-        Block block = event.getBlock();
-        int level = block.getY();
-
-        List<Material> specificBlocksToPreventPlacing = this.config.blockPlacement.restrictedBlockTypes;
-
-        boolean isPlacementBlocked = this.isPlacementBlocked(level);
-
-        if (isPlacementBlocked && specificBlocksToPreventPlacing.isEmpty()) {
-            event.setCancelled(true);
-            this.noticeService.create()
-                .player(uniqueId)
-                .notice(this.config.messagesSettings.blockPlacingBlockedDuringCombat)
-                .placeholder("{Y}", String.valueOf(this.config.blockPlacement.blockPlacementYCoordinate))
-                .placeholder("{MODE}", this.config.blockPlacement.blockPlacementModeDisplayName)
-                .send();
-
-        }
-
-        Material blockMaterial = block.getType();
-        boolean isBlockInDisabledList = specificBlocksToPreventPlacing.contains(blockMaterial);
-        if (isPlacementBlocked && isBlockInDisabledList) {
-            event.setCancelled(true);
-
-            this.noticeService.create()
-                .player(uniqueId)
-                .notice(this.config.messagesSettings.blockPlacingBlockedDuringCombat)
-                .placeholder("{Y}", String.valueOf(this.config.blockPlacement.blockPlacementYCoordinate))
-                .placeholder("{MODE}", this.config.blockPlacement.blockPlacementModeDisplayName)
-                .send();
-
-        }
-    }
-
-    private boolean isPlacementBlocked(int level) {
-        return this.config.blockPlacement.blockPlacementMode == BlockPlacementSettings.BlockPlacingMode.ABOVE
-            ? level > this.config.blockPlacement.blockPlacementYCoordinate
-            : level < this.config.blockPlacement.blockPlacementYCoordinate;
-    }
-
-    @EventHandler
-    void onToggleGlide(EntityToggleGlideEvent event) {
-        if (!this.config.combat.disableElytraUsage) {
-            return;
-        }
-
-        if (!(event.getEntity() instanceof Player player)) {
-            return;
-        }
-        UUID uniqueId = player.getUniqueId();
-
-        if (!this.fightManager.isInCombat(uniqueId)) {
-            return;
-        }
-
-        if (event.isGliding()) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler
-    void onMoveWhileGliding(PlayerMoveEvent event) {
-        if (!this.config.combat.disableElytraUsage) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-        UUID uniqueId = player.getUniqueId();
-
-        if (!this.fightManager.isInCombat(uniqueId)) {
-            return;
-        }
-
-        if (player.isGliding()) {
-            player.setGliding(false);
-        }
-    }
-
-
-
-    @EventHandler
-    void onFly(PlayerToggleFlightEvent event) {
-        if (!this.config.combat.disableFlying) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-        UUID uniqueId = player.getUniqueId();
-
-        if (!this.fightManager.isInCombat(uniqueId)) {
-            return;
-        }
-
-        if (event.isFlying()) {
-            player.setAllowFlight(false);
-
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler
-    void onUnTag(FightUntagEvent event) {
-        if (!this.config.combat.disableFlying) {
-            return;
-        }
-
-        UUID uniqueId = event.getPlayer();
-        Player player = this.server.getPlayer(uniqueId);
-
-        if (player == null) {
-            return;
-        }
-        GameMode playerGameMode = player.getGameMode();
-        if (playerGameMode == GameMode.CREATIVE || playerGameMode == GameMode.SPECTATOR) {
-            player.setAllowFlight(true);
-        }
-    }
-
-    @EventHandler
-    void onDamage(EntityDamageEvent event) {
-        if (!this.config.combat.disableElytraOnDamage) {
-            return;
-        }
-
-        if (!(event.getEntity() instanceof Player player)) {
-            return;
-        }
-        UUID uniqueId = player.getUniqueId();
-
-        if (this.fightManager.isInCombat(uniqueId) && player.isGliding()) {
-            player.setGliding(false);
-        }
-    }
-
-    @EventHandler
-    void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
-        Player player = event.getPlayer();
-        UUID playerUniqueId = player.getUniqueId();
-
-        if (!this.fightManager.isInCombat(playerUniqueId)) {
-            return;
-        }
-
-        String command = event.getMessage().substring(1);
-
-        boolean isAnyMatch = this.config.commands.restrictedCommands.stream()
-            .anyMatch(restrictedCommand -> StringUtil.startsWithIgnoreCase(command, restrictedCommand));
-
-        WhitelistBlacklistMode mode = this.config.commands.commandRestrictionMode;
-
-        boolean shouldCancel = mode.shouldBlock(isAnyMatch);
-
-        if (shouldCancel) {
-            event.setCancelled(true);
-            this.noticeService.create()
-                .player(playerUniqueId)
-                .notice(this.config.messagesSettings.commandDisabledDuringCombat)
-                .send();
-
-        }
-    }
-}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightMessageController.java

@@ -5,6 +5,8 @@ import com.eternalcode.combat.fight.FightManager;
 import com.eternalcode.combat.fight.event.FightTagEvent;
 import com.eternalcode.combat.fight.event.FightUntagEvent;
 import com.eternalcode.combat.notification.NoticeService;
+import java.util.Optional;
+import java.util.UUID;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -37,12 +39,23 @@ public class FightMessageController implements Listener {
             return;
         }
 
+        String opponent = this.resolveOpponentName(event.getTagger(), player.getUniqueId());
+
         this.noticeService.create()
             .player(player.getUniqueId())
             .notice(this.config.messagesSettings.playerTagged)
+            .placeholder("{OPPONENT}", opponent)
             .send();
     }
 
+    private String resolveOpponentName(UUID tagger, UUID taggedPlayer) {
+        return Optional.ofNullable(tagger)
+            .filter(uuid -> !uuid.equals(taggedPlayer))
+            .map(this.server::getPlayer)
+            .map(Player::getName)
+            .orElse(this.config.messagesSettings.unknownPlayerPlaceholder);
+    }
+
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     void onUnTag(FightUntagEvent event) {
         Player player = this.server.getPlayer(event.getPlayer());

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightTagController.java

@@ -1,5 +1,6 @@
 package com.eternalcode.combat.fight.controller;
 
+import com.eternalcode.combat.FoliaChecker;
 import com.eternalcode.combat.WhitelistBlacklistMode;
 import com.eternalcode.combat.config.implementation.PluginConfig;
 import com.eternalcode.combat.fight.FightManager;
@@ -55,6 +56,16 @@ public class FightTagController implements Listener {
             return;
         }
 
+        UUID targetId = attackedPlayerByPerson.getUniqueId();
+        UUID attackerId = attacker.getUniqueId();
+
+        if (
+            targetId.equals(attackerId)
+            && FoliaChecker.isFolia()
+        ) {
+            return;
+        }
+
         if (this.config.combat.disableFlying) {
             if (attackedPlayerByPerson.isFlying()) {
                 attackedPlayerByPerson.setFlying(false);
@@ -68,11 +79,9 @@ public class FightTagController implements Listener {
         }
 
         Duration combatTime = this.config.settings.combatTimerDuration;
-        UUID attackedUniqueId = attackedPlayerByPerson.getUniqueId();
-        UUID attackerUniqueId = attacker.getUniqueId();
 
-        this.fightManager.tag(attackedUniqueId, combatTime, CauseOfTag.PLAYER, attackerUniqueId);
-        this.fightManager.tag(attackerUniqueId, combatTime, CauseOfTag.PLAYER, attackedUniqueId);
+        this.fightManager.tag(targetId, combatTime, CauseOfTag.PLAYER, attackerId);
+        this.fightManager.tag(attackerId, combatTime, CauseOfTag.PLAYER, targetId);
     }
 
 

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightUnTagController.java

@@ -1,6 +1,6 @@
 package com.eternalcode.combat.fight.controller;
 
-import com.eternalcode.combat.crystalpvp.CrystalPvpConstants;
+import com.eternalcode.combat.fight.crystalpvp.CrystalPvpConstants;
 import com.eternalcode.combat.fight.FightManager;
 import com.eternalcode.combat.fight.event.CauseOfUnTag;
 import com.eternalcode.combat.config.implementation.PluginConfig;

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/crystalpvp/CrystalMetadata.java

@@ -1,4 +1,4 @@
-package com.eternalcode.combat.crystalpvp;
+package com.eternalcode.combat.fight.crystalpvp;
 
 import java.util.Optional;
 import java.util.UUID;

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/crystalpvp/CrystalPvpConstants.java

@@ -1,14 +1,13 @@
-package com.eternalcode.combat.crystalpvp;
+package com.eternalcode.combat.fight.crystalpvp;
 
 import com.eternalcode.combat.config.implementation.PluginConfig;
 import com.eternalcode.combat.fight.FightManager;
 import com.eternalcode.combat.fight.event.CauseOfTag;
-import com.eternalcode.combat.util.ReflectUtil;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import org.bukkit.Material;
-import org.bukkit.block.BlockState;
+import org.bukkit.block.Block;
 import org.bukkit.entity.EnderCrystal;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageByBlockEvent;
@@ -23,21 +22,6 @@ public class CrystalPvpConstants {
     public static final String CRYSTAL_METADATA = "eternalcombat:crystal";
     public static final String ANCHOR_METADATA = "eternalcombat:anchor";
 
-    private static final boolean HAS_DAMAGER_BLOCK_STATE = checkForDamagerBlockState();
-
-    private static boolean checkForDamagerBlockState() {
-        try {
-            return EntityDamageByBlockEvent.class.getDeclaredMethod("getDamagerBlockState") != null;
-        }
-        catch (NoSuchMethodException exception) {
-            return false;
-        }
-    }
-
-    static boolean hasDamagerBlockState() {
-        return HAS_DAMAGER_BLOCK_STATE;
-    }
-
     public static Optional<UUID> getDamagerUniqueIdFromEndCrystal(EntityDamageByEntityEvent event) {
         if (event.getDamager() instanceof EnderCrystal enderCrystal) {
             List<MetadataValue> metadataValues = enderCrystal.getMetadata(CRYSTAL_METADATA);
@@ -52,20 +36,16 @@ public class CrystalPvpConstants {
     }
 
     public static Optional<UUID> getDamagerUniqueIdFromRespawnAnchor(EntityDamageByBlockEvent event) {
-        if (!CrystalPvpConstants.hasDamagerBlockState()) {
+        Block damager = event.getDamager();
+        if (damager == null) {
             return Optional.empty();
         }
 
-        Object maybeState = ReflectUtil.invokeMethod(event, "getDamagerBlockState");
-        if (!(maybeState instanceof BlockState state)) {
-            return Optional.empty();
-        }
-        Material type = state.getType();
-        if (!type.equals(Material.RESPAWN_ANCHOR)) {
+        if (damager.getType() != Material.RESPAWN_ANCHOR) {
             return Optional.empty();
         }
 
-        return state.getMetadata(ANCHOR_METADATA).stream()
+        return damager.getMetadata(ANCHOR_METADATA).stream()
             .filter(source -> source instanceof CrystalMetadata)
             .map(meta -> (CrystalMetadata) meta)
             .findFirst()
@@ -86,12 +66,14 @@ public class CrystalPvpConstants {
                 fightManager.tag(
                     damagerUniqueId,
                     pluginConfig.settings.combatTimerDuration,
-                    CauseOfTag.CRYSTAL
+                    CauseOfTag.CRYSTAL,
+                    victimUniqueId
                 );
                 fightManager.tag(
                     victimUniqueId,
                     pluginConfig.settings.combatTimerDuration,
-                    CauseOfTag.CRYSTAL
+                    CauseOfTag.CRYSTAL,
+                    damagerUniqueId
                 );
             }
         }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/crystalpvp/EndCrystalController.java

@@ -1,4 +1,4 @@
-package com.eternalcode.combat.crystalpvp;
+package com.eternalcode.combat.fight.crystalpvp;
 
 import com.eternalcode.combat.config.implementation.PluginConfig;
 import com.eternalcode.combat.fight.FightManager;
@@ -12,15 +12,15 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.plugin.Plugin;
-import static com.eternalcode.combat.crystalpvp.CrystalPvpConstants.CRYSTAL_METADATA;
+import static com.eternalcode.combat.fight.crystalpvp.CrystalPvpConstants.CRYSTAL_METADATA;
 
-public class EndCrystalListener implements Listener {
+public class EndCrystalController implements Listener {
 
     private final Plugin plugin;
     private final FightManager fightManager;
     private final PluginConfig pluginConfig;
 
-    public EndCrystalListener(Plugin plugin, FightManager fightManager, PluginConfig pluginConfig) {
+    public EndCrystalController(Plugin plugin, FightManager fightManager, PluginConfig pluginConfig) {
         this.plugin = plugin;
         this.fightManager = fightManager;
         this.pluginConfig = pluginConfig;

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/crystalpvp/RespawnAnchorController.java

@@ -1,4 +1,4 @@
-package com.eternalcode.combat.crystalpvp;
+package com.eternalcode.combat.fight.crystalpvp;
 
 import com.eternalcode.combat.config.implementation.PluginConfig;
 import com.eternalcode.combat.fight.FightManager;
@@ -16,16 +16,16 @@ import org.bukkit.event.entity.EntityDamageByBlockEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
-import static com.eternalcode.combat.crystalpvp.CrystalPvpConstants.ANCHOR_METADATA;
+import static com.eternalcode.combat.fight.crystalpvp.CrystalPvpConstants.ANCHOR_METADATA;
 
-public class RespawnAnchorListener implements Listener {
+public class RespawnAnchorController implements Listener {
 
     private final Plugin plugin;
     private final FightManager fightManager;
     private final PluginConfig pluginConfig;
 
 
-    public RespawnAnchorListener(Plugin plugin, FightManager fightManager, PluginConfig pluginConfig) {
+    public RespawnAnchorController(Plugin plugin, FightManager fightManager, PluginConfig pluginConfig) {
         this.plugin = plugin;
         this.fightManager = fightManager;
         this.pluginConfig = pluginConfig;

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/effect/FightEffectController.java

@@ -4,7 +4,6 @@ import com.eternalcode.combat.fight.FightManager;
 import com.eternalcode.combat.fight.event.CauseOfUnTag;
 import com.eternalcode.combat.fight.event.FightTagEvent;
 import com.eternalcode.combat.fight.event.FightUntagEvent;
-import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -50,9 +49,11 @@ public class FightEffectController implements Listener {
         }
 
         if (event.getCause() == CauseOfUnTag.LOGOUT) {
-            Player player = Bukkit.getPlayer(event.getPlayer());
+            Player player = this.server.getPlayer(event.getPlayer());
+            if (player == null) {
+                return;
+            }
 
-            assert player != null;
             this.effectService.clearStoredEffects(player);
         }
     }
@@ -80,9 +81,11 @@ public class FightEffectController implements Listener {
             return;
         }
         if (event.getCause() == CauseOfUnTag.DEATH_BY_PLAYER || event.getCause() == CauseOfUnTag.DEATH) {
-            Player player = Bukkit.getPlayer(event.getPlayer());
+            Player player = this.server.getPlayer(event.getPlayer());
+            if (player == null) {
+                return;
+            }
 
-            assert player != null;
             this.effectService.clearStoredEffects(player);
         }
     }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/effect/FightEffectSettings.java

@@ -1,11 +1,10 @@
 package com.eternalcode.combat.fight.effect;
 
+import com.cryptomorin.xseries.XPotion;
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.annotation.Comment;
-
-import org.bukkit.potion.PotionEffectType;
-
 import java.util.Map;
+import org.bukkit.potion.PotionEffectType;
 
 public class FightEffectSettings extends OkaeriConfig {
 
@@ -16,11 +15,20 @@ public class FightEffectSettings extends OkaeriConfig {
         "# If the option above is set to true, you can add effects to players in combat below",
         "# You can find a list of all potion effects here: https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/potion/PotionEffectType.html",
         "# Correct format: 'EFFECT_TYPE:AMPLIFIER' Amplifier strength starts from 0, so level 1 gives effect strength 2",
-        "# Example: SPEED:1, DAMAGE_RESISTANCE:0",
+        "# Example: SPEED:1, RESISTANCE:0",
     })
     public Map<PotionEffectType, Integer> customEffects = Map.of(
-        PotionEffectType.SPEED, 1,
-        PotionEffectType.DAMAGE_RESISTANCE, 0
+        requirePotionEffectType(XPotion.SPEED), 1,
+        requirePotionEffectType(XPotion.RESISTANCE), 0
     );
 
+    private static PotionEffectType requirePotionEffectType(XPotion potion) {
+        PotionEffectType potionEffectType = potion.get();
+        if (potionEffectType == null) {
+            throw new IllegalStateException("Potion effect " + potion.name() + " is not supported by this server version");
+        }
+
+        return potionEffectType;
+    }
+
 }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/knockback/KnockbackMountController.java

@@ -0,0 +1,129 @@
+package com.eternalcode.combat.fight.knockback;
+
+import com.eternalcode.combat.fight.FightManager;
+import com.eternalcode.combat.notification.NoticeService;
+import com.eternalcode.combat.region.RegionProvider;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Method;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Level;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityEvent;
+import org.bukkit.plugin.Plugin;
+
+// EntityMountEvent moved between org.spigotmc, io.papermc.paper and org.bukkit across versions,
+// so we resolve it at runtime to stay compatible without bumping the compile API.
+public final class KnockbackMountController implements Listener {
+
+    private static final String[] EVENT_CLASS_CANDIDATES = {
+        "org.bukkit.event.entity.EntityMountEvent",
+        "io.papermc.paper.event.entity.EntityMountEvent",
+        "org.spigotmc.event.entity.EntityMountEvent",
+    };
+
+    private final NoticeService noticeService;
+    private final RegionProvider regionProvider;
+    private final FightManager fightManager;
+    private final AtomicBoolean mountFailureLogged = new AtomicBoolean();
+
+    public KnockbackMountController(NoticeService noticeService, RegionProvider regionProvider, FightManager fightManager) {
+        this.noticeService = noticeService;
+        this.regionProvider = regionProvider;
+        this.fightManager = fightManager;
+    }
+
+    public void register(Plugin plugin) {
+        Class<? extends Event> eventClass = null;
+        for (String candidate : EVENT_CLASS_CANDIDATES) {
+            try {
+                eventClass = Class.forName(candidate).asSubclass(Event.class);
+                break;
+            } catch (ClassNotFoundException | ClassCastException ignored) {
+            }
+        }
+
+        if (eventClass == null) {
+            plugin.getLogger().warning("Could not find any EntityMountEvent class; mount protection in regions is disabled.");
+            return;
+        }
+
+        MethodHandle getMountHandle;
+        try {
+            getMountHandle = this.resolveGetMountHandle(eventClass);
+        } catch (NoSuchMethodException | IllegalAccessException exception) {
+            plugin.getLogger().log(Level.WARNING, "EntityMountEvent has incompatible getMount() method; mount protection in regions is disabled.", exception);
+            return;
+        }
+
+        plugin.getServer().getPluginManager().registerEvent(
+            eventClass,
+            this,
+            EventPriority.HIGHEST,
+            (listener, event) -> this.handle(event, getMountHandle, plugin),
+            plugin,
+            true
+        );
+    }
+
+    private MethodHandle resolveGetMountHandle(Class<? extends Event> eventClass) throws NoSuchMethodException, IllegalAccessException {
+        if (!EntityEvent.class.isAssignableFrom(eventClass) || !Cancellable.class.isAssignableFrom(eventClass)) {
+            throw new NoSuchMethodException(eventClass.getName() + " is not a cancellable entity event");
+        }
+
+        Method getMount = eventClass.getMethod("getMount");
+        if (!Entity.class.isAssignableFrom(getMount.getReturnType())) {
+            throw new NoSuchMethodException(eventClass.getName() + "#getMount() does not return Entity");
+        }
+
+        return MethodHandles.publicLookup()
+            .unreflect(getMount)
+            .asType(MethodType.methodType(Entity.class, Event.class));
+    }
+
+    private void handle(Event event, MethodHandle getMountHandle, Plugin plugin) {
+        if (!(event instanceof EntityEvent entityEvent) || !(event instanceof Cancellable cancellable)) {
+            return;
+        }
+
+        if (!(entityEvent.getEntity() instanceof Player player)) {
+            return;
+        }
+
+        if (!this.fightManager.isInCombat(player.getUniqueId())) {
+            return;
+        }
+
+        Entity mount;
+        try {
+            mount = (Entity) getMountHandle.invokeExact(event);
+        } catch (Throwable exception) {
+            this.logMountFailure(plugin, exception);
+            return;
+        }
+
+        if (mount == null || !this.regionProvider.isInRegion(mount.getLocation())) {
+            return;
+        }
+
+        cancellable.setCancelled(true);
+        this.noticeService.create()
+            .player(player.getUniqueId())
+            .notice(config -> config.messagesSettings.cantEnterOnRegion)
+            .send();
+    }
+
+    private void logMountFailure(Plugin plugin, Throwable exception) {
+        if (!this.mountFailureLogged.compareAndSet(false, true)) {
+            return;
+        }
+
+        plugin.getLogger().log(Level.WARNING, "Could not read EntityMountEvent mount; mount protection in regions is skipped.", exception);
+    }
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/knockback/KnockbackOutsideRegionGenerator.java

@@ -3,53 +3,21 @@ package com.eternalcode.combat.fight.knockback;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.NavigableMap;
+import java.util.Optional;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.function.Function;
 import org.bukkit.Location;
 
 class KnockbackOutsideRegionGenerator {
 
-    static Location generate(Point2D min, Point2D max, Location playerLocation) {
-        NavigableMap<Double, List<Point2D>> points = generatePoints(min, max, Point2D.from(playerLocation));
-        NavigableMap<Double, Double> distances = new TreeMap<>();
-        double totalWeight = 0;
-
-        Double maxDistance = points.lastKey();
-
-        for (double distance : points.keySet()) {
-            double weight = createWeight(distance, maxDistance);
-            distances.put(distance, weight);
-            totalWeight += weight;
-        }
-
-        double rand = Math.random() * totalWeight;
-        double cumulativeWeight = 0;
-
-        for (Map.Entry<Double, Double> entry : distances.entrySet()) {
-            double distance = entry.getKey();
-            double weight = entry.getValue();
-
-            cumulativeWeight += weight;
-            if (rand <= cumulativeWeight) {
-                return getRandom(points.get(distance))
-                    .toLocation(playerLocation);
-            }
-        }
-
-        return getRandom(points.firstEntry().getValue())
-            .toLocation(playerLocation);
-    }
-
-    private static Point2D getRandom(List<Point2D> points) {
-        return points.get((int) (Math.random() * points.size()));
-    }
-
-    private static double createWeight(double distance, double maxDistance) {
-        double last = Math.log(maxDistance);
-        double weight = last - Math.log(distance);
-        return Math.pow(weight, 10);
+    static Optional<Location> generate(Point2D min, Point2D max, Location playerLocation, Function<Location, Optional<Location>> safeMapper) {
+        return generatePoints(min, max, Point2D.from(playerLocation)).entrySet().stream()
+            .flatMap(entry -> entry.getValue().stream())
+            .map(point2D -> point2D.toLocation(playerLocation))
+            .flatMap(safeMapper.andThen(validPoint -> validPoint.stream()))
+            .findFirst();
     }
 
     private static NavigableMap<Double, List<Point2D>> generatePoints(Point2D min, Point2D max, Point2D location) {
@@ -78,5 +46,4 @@ class KnockbackOutsideRegionGenerator {
         return Math.sqrt(Math.pow(p2.x() - p1.x(), 2) + Math.pow(p2.z() - p1.z(), 2));
     }
 
-
 }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/knockback/KnockbackRegionController.java

@@ -17,7 +17,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.vehicle.VehicleMoveEvent;
-import org.spigotmc.event.entity.EntityMountEvent;
 
 public class KnockbackRegionController implements Listener {
 
@@ -132,27 +131,6 @@ public class KnockbackRegionController implements Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
-    void onEntityMount(EntityMountEvent event) {
-        if (!(event.getEntity() instanceof Player player)) {
-            return;
-        }
-
-        if (!this.fightManager.isInCombat(player.getUniqueId())) {
-            return;
-        }
-
-        if (!this.regionProvider.isInRegion(event.getMount().getLocation())) {
-            return;
-        }
-
-        event.setCancelled(true);
-        this.noticeService.create()
-            .player(player.getUniqueId())
-            .notice(config -> config.messagesSettings.cantEnterOnRegion)
-            .send();
-    }
-
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     void onTag(FightTagEvent event) {
         Player player = this.server.getPlayer(event.getPlayer());

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/knockback/KnockbackService.java

@@ -1,23 +1,29 @@
 package com.eternalcode.combat.fight.knockback;
 
+import com.cryptomorin.xseries.XMaterial;
 import com.eternalcode.combat.config.implementation.PluginConfig;
-import com.eternalcode.combat.region.Point;
 import com.eternalcode.combat.region.Region;
 import com.eternalcode.combat.region.RegionProvider;
 import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
-import io.papermc.lib.PaperLib;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.util.Vector;
 
 public final class KnockbackService {
 
+    private static final int FORCE_TELEPORT_MAX_ATTEMPTS = 10;
+    private static final double KNOCKBACK_DAMPEN_FACTOR = 0.8;
+    public static final int DEPTH_OF_SEARCHING = 10;
+
     private final PluginConfig config;
     private final MinecraftScheduler scheduler;
     private final RegionProvider regionProvider;
@@ -31,20 +37,63 @@ public final class KnockbackService {
     }
 
     public void knockbackLater(Region region, Player player, Duration duration) {
-        this.scheduler.runLater(() -> this.knockback(region, player), duration);
+        scheduler.runLater(() -> this.knockback(region, player), duration);
+    }
+
+    public void knockback(Region region, Player player) {
+        if (player.isInsideVehicle()) {
+            player.leaveVehicle();
+        }
+
+        Location currentLocation = player.getLocation();
+        Vector shortestDirection = getShortestDirectionToEdge(region, currentLocation);
+
+        // Reduces player's current velocity BEFORE applying knockback. Helps create a smoother and more consistent knockback.
+        player.setVelocity(player.getVelocity().multiply(KNOCKBACK_DAMPEN_FACTOR));
+
+        double y = Math.min(player.getVelocity().getY(), config.knockback.vertical);
+        Vector velocity = shortestDirection.multiply(config.knockback.multiplier).setY(y);
+
+        player.setFallDistance(0);
+        player.setVelocity(velocity);
+    }
+
+    private Vector getShortestDirectionToEdge(Region region, Location current) {
+        double directionToBottomEdge = current.getX() - region.getMin().getX();
+        double directionToTopEdge = region.getMax().getX() - current.getX();
+        double directionToLeftEdge = current.getZ() - region.getMin().getZ();
+        double directionToRightEdge = region.getMax().getZ() - current.getZ();
+
+        double shortestDirection = Math.min(
+            Math.min(directionToBottomEdge, directionToTopEdge),
+            Math.min(directionToLeftEdge, directionToRightEdge)
+        );
+
+        if (shortestDirection == directionToBottomEdge)
+            return new Vector(-1, 0, 0);
+        if (shortestDirection == directionToTopEdge)
+            return new Vector(1, 0, 0);
+        if (shortestDirection == directionToLeftEdge)
+            return new Vector(0, 0, -1);
+        if (shortestDirection == directionToRightEdge)
+            return new Vector(0, 0, 1);
+        throw new IllegalStateException("Failed to determine direction to edge");
     }
 
     public void forceKnockbackLater(Player player, Region region) {
-        if (insideRegion.containsKey(player.getUniqueId())) {
+        UUID playerId = player.getUniqueId();
+
+        if (insideRegion.containsKey(playerId)) {
             return;
         }
 
-        insideRegion.put(player.getUniqueId(), region);
+        insideRegion.put(playerId, region);
 
         scheduler.runLater(player.getLocation(), () -> {
-            insideRegion.remove(player.getUniqueId());
+            insideRegion.remove(playerId);
 
             Location playerLocation = player.getLocation();
+
             if (!region.contains(playerLocation) && !regionProvider.isInRegion(playerLocation)) {
                 return;
             }
@@ -53,35 +102,76 @@ public final class KnockbackService {
                 player.leaveVehicle();
             }
 
-            Location location = generate(playerLocation, Point2D.from(region.getMin()), Point2D.from(region.getMax()));
-
-            PaperLib.teleportAsync(player, location, TeleportCause.PLUGIN);
-        }, this.config.knockback.forceDelay);
+            generate(playerLocation, Point2D.from(region.getMin()), Point2D.from(region.getMax()), 0)
+                .ifPresent(location -> player.teleportAsync(location, TeleportCause.PLUGIN));
+        }, config.knockback.forceTeleport.delay);
     }
 
-    private Location generate(Location playerLocation, Point2D minX, Point2D maxX) {
-        Location location = KnockbackOutsideRegionGenerator.generate(minX, maxX, playerLocation);
-        Optional<Region> otherRegion = regionProvider.getRegion(location);
+    private Optional<Location> generate(Location playerLocation, Point2D min, Point2D max, int attempts) {
+        if (attempts >= FORCE_TELEPORT_MAX_ATTEMPTS) {
+            return Optional.of(playerLocation);
+        }
+
+        Optional<Location> location = KnockbackOutsideRegionGenerator.generate(min, max, playerLocation, candidate -> makeSafe(candidate));
+        if (location.isEmpty()) {
+            int expand = (attempts + 1) * (attempts + 1);
+            return generate(playerLocation, min.expandMin(expand, expand), max.expandMax(expand, expand), attempts + 1);
+        }
+
+        Optional<Region> otherRegion = regionProvider.getRegion(location.get());
         if (otherRegion.isPresent()) {
             Region region = otherRegion.get();
-            return generate(playerLocation, minX.min(region.getMin()), maxX.max(region.getMax()));
+            return generate(playerLocation, min.min(region.getMin()), max.max(region.getMax()), attempts + 1);
         }
 
-        return location;
+        return location.map(loc -> loc.add(0.5, 0, 0.5));
     }
 
-    public void knockback(Region region, Player player) {
-        if (player.isInsideVehicle()) {
-            player.leaveVehicle();
+    private Optional<Location> makeSafe(Location random) {
+        Location maybeSafe = random.clone();
+        int minY = maybeSafe.getBlockY() - DEPTH_OF_SEARCHING;
+
+        CachedPillarOfBlocks pillar = new CachedPillarOfBlocks(maybeSafe.getBlockX(), maybeSafe.getBlockZ(), maybeSafe.getWorld());
+
+        for (int y = maybeSafe.getBlockY(); y > minY; y--) {
+            maybeSafe.setY(y);
+
+            Material ground = pillar.get(maybeSafe.getBlockY() - 1);
+            Material legs = pillar.get(maybeSafe.getBlockY());
+            Material head = pillar.get(maybeSafe.getBlockY() + 1);
+
+            if (ground.isSolid()
+                && !containsMaterial(config.knockback.forceTeleport.unsafeGroundBlocks, ground)
+                && containsMaterial(config.knockback.forceTeleport.airBlocks, legs)
+                && containsMaterial(config.knockback.forceTeleport.airBlocks, head)
+            ) {
+                return Optional.of(maybeSafe);
+            }
         }
 
-        Point point = region.getCenter();
-        Location subtract = player.getLocation().subtract(point.x(), 0, point.z());
-
-        Vector knockbackVector = new Vector(subtract.getX(), 0, subtract.getZ()).normalize();
-        double multiplier = this.config.knockback.multiplier;
-        Vector configuredVector = new Vector(multiplier, 0.5, multiplier);
-
-        player.setVelocity(knockbackVector.multiply(configuredVector));
+        return Optional.empty();
     }
+
+    private boolean containsMaterial(Set<XMaterial> materials, Material material) {
+        return materials.contains(XMaterial.matchXMaterial(material));
+    }
+
+    private static class CachedPillarOfBlocks {
+
+        private final int x;
+        private final int z;
+        private final World world;
+        private final Map<Integer, Material> blocksTypes = new HashMap<>();
+
+        private CachedPillarOfBlocks(int x, int z, World world) {
+            this.x = x;
+            this.z = z;
+            this.world = world;
+        }
+
+        public Material get(int y) {
+            return this.blocksTypes.computeIfAbsent(y, __ -> world.getType(x, y, z));
+        }
+    }
+
 }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/knockback/KnockbackSettings.java

@@ -1,19 +1,138 @@
 package com.eternalcode.combat.fight.knockback;
 
+import com.cryptomorin.xseries.XMaterial;
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.annotation.Comment;
 import java.time.Duration;
+import java.util.EnumSet;
+import java.util.Set;
 
 public class KnockbackSettings extends OkaeriConfig {
 
     @Comment({
-        "# Adjust the knockback multiplier for restricted regions.",
-        "# Higher values increase the knockback distance. Avoid using negative values.",
-        "# A value of 1.0 typically knocks players 2-4 blocks away."
+        "# Horizontal knockback strength multiplier.",
+        "# This controls how far the player is pushed horizontally.",
+        "#",
+        "# Applied in: direction.multiply(multiplier)",
+        "# Example: 1.0 ≈ 2–4 blocks push"
     })
-    public double multiplier = 1;
+    public double multiplier = 1.0;
+
+    @Comment({
+        "# Vertical velocity applied when the player is considered on ground.",
+        "#",
+        "# Used when Y velocity is near zero (< 0.08).",
+        "# Higher values = more upward knockback.",
+        "# Recommended: 0.15 - 0.3"
+    })
+    public double vertical = 0.2;
+
+    @Comment({
+        "# Force teleport settings for players that fail to be knocked back outside the region.",
+        "# If a player cannot be knocked back outside the region after multiple attempts,",
+        "# they will be teleported to a safe location outside the region after a short delay.",
+        "# This ensures players don't get stuck inside the region due to knockback failures."
+    })
+    public ForceTeleport forceTeleport = new ForceTeleport();
+
+    public static class ForceTeleport extends OkaeriConfig {
+
+        @Comment({
+            "# Delay before force teleport is applied after entering a region.",
+            "# Recommended: 1-3 seconds to allow knockback attempts before teleporting.",
+        })
+        public Duration delay = Duration.ofSeconds(1);
+
+        @Comment({
+            "# Blocks that are considered unsafe to stand on when searching for ground.",
+            "# These blocks will be ignored during safe ground detection.",
+            "#",
+            "# Used in findSafeGround():",
+            "# - Skips these blocks even if they are solid",
+            "# - Prevents teleporting onto dangerous or invalid blocks",
+            "#",
+            "# Examples:",
+            "# - BARRIER (invisible collision)",
+            "# - LAVA / WATER (damage / movement issues)",
+            "# - CACTUS / MAGMA (damage blocks)",
+        })
+        public Set<XMaterial> unsafeGroundBlocks = EnumSet.of(
+            XMaterial.BARRIER,
+            XMaterial.LAVA,
+            XMaterial.WATER,
+            XMaterial.CACTUS,
+            XMaterial.MAGMA_BLOCK,
+            XMaterial.FIRE,
+            XMaterial.SOUL_FIRE,
+            XMaterial.COBWEB,
+            XMaterial.SWEET_BERRY_BUSH,
+            XMaterial.BEDROCK,
+            XMaterial.TNT,
+            XMaterial.SEAGRASS,
+            XMaterial.TALL_SEAGRASS,
+            XMaterial.BUBBLE_COLUMN,
+            XMaterial.POWDER_SNOW,
+            XMaterial.WITHER_ROSE
+        );
+
+        @Comment({
+            "# Safe blocks that players can be teleported into",
+            "# These blocks don't cause damage and allow free movement",
+            "# Players can safely spawn in these blocks or pass through them",
+            "# Includes air, grass, flowers, and other non-solid blocks"
+        })
+        public Set<XMaterial> airBlocks = EnumSet.of(
+            XMaterial.AIR,
+            XMaterial.CAVE_AIR,
+            XMaterial.VOID_AIR,
+            XMaterial.TALL_SEAGRASS,
+            XMaterial.SEAGRASS,
+            XMaterial.SHORT_GRASS,
+            XMaterial.TALL_GRASS,
+            XMaterial.VINE,
+            XMaterial.STRUCTURE_VOID,
+            XMaterial.DEAD_BUSH,
+            XMaterial.DANDELION,
+            XMaterial.POPPY,
+            XMaterial.BLUE_ORCHID,
+            XMaterial.ALLIUM,
+            XMaterial.AZURE_BLUET,
+            XMaterial.RED_TULIP,
+            XMaterial.ORANGE_TULIP,
+            XMaterial.WHITE_TULIP,
+            XMaterial.PINK_TULIP,
+            XMaterial.OXEYE_DAISY,
+            XMaterial.CORNFLOWER,
+            XMaterial.LILY_OF_THE_VALLEY,
+            XMaterial.SUNFLOWER,
+            XMaterial.LILAC,
+            XMaterial.ROSE_BUSH,
+            XMaterial.PEONY,
+            XMaterial.WITHER_ROSE,
+            XMaterial.LARGE_FERN,
+            XMaterial.RAIL,
+            XMaterial.POWERED_RAIL,
+            XMaterial.DETECTOR_RAIL,
+            XMaterial.ACTIVATOR_RAIL,
+            XMaterial.REDSTONE_WIRE,
+            XMaterial.COMPARATOR,
+            XMaterial.REPEATER,
+            XMaterial.LEVER,
+            XMaterial.STRING,
+            XMaterial.SNOW,
+            XMaterial.CRIMSON_ROOTS,
+            XMaterial.WARPED_ROOTS,
+            XMaterial.CRIMSON_FUNGUS,
+            XMaterial.WARPED_FUNGUS,
+            XMaterial.TORCH,
+            XMaterial.WALL_TORCH,
+            XMaterial.REDSTONE_TORCH,
+            XMaterial.REDSTONE_WALL_TORCH,
+            XMaterial.SOUL_TORCH,
+            XMaterial.SOUL_WALL_TORCH
+        );
+
+    }
 
-    @Comment({ "# Time after which the player will be force knocked back outside the safe zone" })
-    public Duration forceDelay = Duration.ofSeconds(1);
 
 }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/knockback/Point2D.java

@@ -5,11 +5,13 @@ import org.bukkit.World;
 
 record Point2D(int x, int z) {
 
-    Location toLocation(Location location) {
-        World world = location.getWorld();
-        int y = world.getHighestBlockYAt(x, z) + 1;
+    Location toLocation(Location playerLocation) {
+        World world = playerLocation.getWorld();
+        int y = world.getEnvironment() == World.Environment.NETHER
+            ? playerLocation.getBlockY() + 1
+            : world.getHighestBlockYAt(x, z) + 1;
 
-        return new Location(world, x, y, z, location.getYaw(), location.getPitch());
+        return new Location(world, x, y, z, playerLocation.getYaw(), playerLocation.getPitch());
     }
 
     static Point2D from(Location location) {
@@ -24,4 +26,12 @@ record Point2D(int x, int z) {
         return new Point2D(Math.max(this.x, max.getBlockX()), Math.max(this.z, max.getBlockZ()));
     }
 
+    public Point2D expandMax(int x, int z) {
+        return new Point2D(this.x + x, this.z + z);
+    }
+
+    public Point2D expandMin(int x, int z) {
+        return new Point2D(this.x - x, this.z - z);
+    }
+
 }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/pearl/FightPearlServiceImpl.java

@@ -1,50 +0,0 @@
-package com.eternalcode.combat.fight.pearl;
-
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.util.UUID;
-
-public class FightPearlServiceImpl implements FightPearlService {
-
-    private final FightPearlSettings pearlSettings;
-    private final Cache<UUID, Instant> pearlStartTimes;
-
-    public FightPearlServiceImpl(FightPearlSettings pearlSettings) {
-        this.pearlSettings = pearlSettings;
-        this.pearlStartTimes = Caffeine.newBuilder()
-            .expireAfterWrite(pearlSettings.pearlThrowDelay)
-            .build();
-    }
-
-    @Override
-    public void markDelay(UUID uuid) {
-        this.pearlStartTimes.put(uuid, Instant.now());
-    }
-
-    @Override
-    public boolean hasDelay(UUID uuid) {
-        return this.pearlStartTimes.getIfPresent(uuid) != null;
-    }
-
-    @Override
-    public Duration getRemainingDelay(UUID uuid) {
-        Instant startTime = this.pearlStartTimes.getIfPresent(uuid);
-        if (startTime == null) {
-            return Duration.ZERO;
-        }
-
-        Duration elapsed = Duration.between(startTime, Instant.now());
-        Duration remaining = this.pearlSettings.pearlThrowDelay.minus(elapsed);
-
-        return remaining.isNegative() ? Duration.ZERO : remaining;
-    }
-
-    @Override
-    public Instant getDelay(UUID uuid) {
-        Instant startTime = this.pearlStartTimes.getIfPresent(uuid);
-        return startTime != null ? startTime.plus(this.pearlSettings.pearlThrowDelay) : Instant.MIN;
-    }
-}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/pearl/PearlController.java

@@ -1,11 +1,11 @@
 package com.eternalcode.combat.fight.pearl;
 
+import com.eternalcode.combat.config.implementation.PluginConfig;
 import com.eternalcode.combat.fight.FightManager;
 import com.eternalcode.combat.notification.NoticeService;
 import com.eternalcode.combat.util.DurationUtil;
 import java.time.Duration;
 import java.util.UUID;
-import org.bukkit.Material;
 import org.bukkit.entity.EnderPearl;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -14,28 +14,26 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.ProjectileLaunchEvent;
-import org.bukkit.inventory.ItemStack;
+import org.bukkit.event.player.PlayerTeleportEvent;
 
-public class FightPearlController implements Listener {
+public class PearlController implements Listener {
 
-    private final FightPearlSettings settings;
+    private final PluginConfig pluginConfig;
+    private final PearlService pearlService;
     private final NoticeService noticeService;
     private final FightManager fightManager;
-    private final FightPearlService fightPearlService;
 
-    public FightPearlController(
-        FightPearlSettings settings,
-        NoticeService noticeService,
-        FightManager fightManager,
-        FightPearlService fightPearlService
+    public PearlController(
+        PluginConfig pluginConfig,
+        PearlService pearlService, NoticeService noticeService, FightManager fightManager
     ) {
-        this.settings = settings;
+        this.pluginConfig = pluginConfig;
+        this.pearlService = pearlService;
         this.noticeService = noticeService;
         this.fightManager = fightManager;
-        this.fightPearlService = fightPearlService;
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPearlThrow(ProjectileLaunchEvent event) {
         if (!(event.getEntity() instanceof EnderPearl)) {
             return;
@@ -47,58 +45,68 @@ public class FightPearlController implements Listener {
 
         UUID playerId = player.getUniqueId();
 
-        if (!this.fightManager.isInCombat(playerId)) {
-            return;
-        }
-
-        if (this.settings.pearlThrowDisabledDuringCombat) {
+        if (this.pearlService.shouldCancelEvent(playerId)) {
             event.setCancelled(true);
+
+            if (this.pluginConfig.pearl.pearlThrowDisabledDuringCombat) {
+                this.noticeService.create()
+                    .player(playerId)
+                    .notice(this.pluginConfig.pearl.pearlThrowBlockedDuringCombat)
+                    .send();
+                return;
+            }
+
+            Duration remainingDelay = this.pearlService.getRemainingDelay(playerId);
             this.noticeService.create()
                 .player(playerId)
-                .notice(this.settings.pearlThrowBlockedDuringCombat)
+                .notice(this.pluginConfig.pearl.pearlThrowBlockedDelayDuringCombat)
+                .placeholder("{TIME}", DurationUtil.format(remainingDelay))
                 .send();
-            return;
+
         }
 
-        if (this.settings.pearlCooldownEnabled) {
-            handlePearlCooldown(event, player, playerId);
-        }
+        this.pearlService.handleDelay(player);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPearlDamage(EntityDamageByEntityEvent event) {
-        if (this.settings.pearlThrowDamageEnabled) {
+        if (this.pluginConfig.pearl.pearlThrowDamageEnabled) {
             return;
         }
 
         if (!(event.getEntity() instanceof Player) ||
             !(event.getDamager() instanceof EnderPearl) ||
-            event.getCause() != EntityDamageEvent.DamageCause.FALL) {
+            event.getCause() != EntityDamageEvent.DamageCause.PROJECTILE) {
             return;
         }
 
         event.setDamage(0.0);
     }
 
-    private void handlePearlCooldown(ProjectileLaunchEvent event, Player player, UUID playerId) {
-        if (this.settings.pearlThrowDelay.isZero()) {
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onPearlTeleport(PlayerTeleportEvent event) {
+        if (event.getCause() != PlayerTeleportEvent.TeleportCause.ENDER_PEARL) {
             return;
         }
 
-        if (this.fightPearlService.hasDelay(playerId)) {
-            event.setCancelled(true);
-            Duration remainingDelay = this.fightPearlService.getRemainingDelay(playerId);
-
-            this.noticeService.create()
-                .player(playerId)
-                .notice(this.settings.pearlThrowBlockedDelayDuringCombat)
-                .placeholder("{TIME}", DurationUtil.format(remainingDelay))
-                .send();
+        if (!this.pluginConfig.pearl.pearlThrowDisabledDuringCombat) {
             return;
         }
 
-        this.fightPearlService.markDelay(playerId);
-        int cooldownTicks = (int) (this.settings.pearlThrowDelay.toMillis() / 50);
-        player.setCooldown(Material.ENDER_PEARL, cooldownTicks);
+        Player player = event.getPlayer();
+        UUID playerId = player.getUniqueId();
+
+        if (!this.fightManager.isInCombat(playerId)) {
+            return;
+        }
+
+        event.setCancelled(true);
+
+        this.noticeService.create()
+            .player(playerId)
+            .notice(this.pluginConfig.pearl.pearlThrowBlockedDuringCombat)
+            .send();
     }
+
 }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/pearl/PearlServiceImpl.java

@@ -0,0 +1,81 @@
+package com.eternalcode.combat.fight.pearl;
+
+import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.fight.FightManager;
+import com.eternalcode.combat.fight.event.CauseOfTag;
+import com.eternalcode.commons.delay.Delay;
+import com.eternalcode.commons.scheduler.Scheduler;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import java.time.Duration;
+import java.util.UUID;
+
+public class PearlServiceImpl implements PearlService {
+
+    private final FightManager fightManager;
+    private final PluginConfig pluginConfig;
+    private final Scheduler scheduler;
+
+    private final Delay<UUID> pearlStartTimes;
+
+    public PearlServiceImpl(FightManager fightManager, PluginConfig pluginConfig, Scheduler scheduler) {
+        this.fightManager = fightManager;
+        this.pluginConfig = pluginConfig;
+
+        this.pearlStartTimes = Delay.withDefault(() -> pluginConfig.pearl.pearlThrowDelay);
+        this.scheduler = scheduler;
+    }
+
+    @Override
+    public boolean shouldCancelEvent(UUID playerId) {
+        if (fightManager.isInCombat(playerId)) {
+            if (this.pluginConfig.pearl.pearlCooldownEnabled) {
+                return this.pearlStartTimes.hasDelay(playerId);
+            }
+
+            return pluginConfig.pearl.pearlThrowDisabledDuringCombat;
+        }
+
+        return false;
+    }
+
+    @Override
+    public void handleDelay(Player player) {
+        UUID uniqueId = player.getUniqueId();
+
+        if (this.hasDelay(uniqueId)) {
+            return;
+        }
+
+        if (this.fightManager.isInCombat(uniqueId)) {
+            if (this.pluginConfig.pearl.pearlExtendsCombatTag) {
+                Duration combatTime = this.pluginConfig.settings.combatTimerDuration;
+                this.fightManager.tag(uniqueId, combatTime, CauseOfTag.ENDER_PEARL);
+            }
+
+            if (this.pluginConfig.pearl.pearlCooldownEnabled && !this.pluginConfig.pearl.pearlThrowDelay.isZero()) {
+                this.pearlStartTimes.markDelay(uniqueId);
+                this.scheduler.runLater(
+                    () -> player.setCooldown(
+                        Material.ENDER_PEARL,
+                        (int) this.pluginConfig.pearl.pearlThrowDelay.toMillis() / 50
+                    ), Duration.ofMillis(50)
+                );
+
+            }
+
+        }
+    }
+
+    @Override
+    public boolean hasDelay(UUID uuid) {
+        return this.pearlStartTimes.hasDelay(uuid);
+    }
+
+    @Override
+    public Duration getRemainingDelay(UUID uuid) {
+        return this.pearlStartTimes.getRemaining(uuid);
+    }
+
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/pearl/PearlSettings.java

@@ -1,13 +1,12 @@
 package com.eternalcode.combat.fight.pearl;
 
-import com.eternalcode.multification.bukkit.notice.BukkitNotice;
 import com.eternalcode.multification.notice.Notice;
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.annotation.Comment;
 
 import java.time.Duration;
 
-public class FightPearlSettings extends OkaeriConfig {
+public class PearlSettings extends OkaeriConfig {
 
     @Comment({ "# Is pearl damage to be enabled?", "# This will work globally" })
     public boolean pearlThrowDamageEnabled = true;
@@ -21,6 +20,9 @@ public class FightPearlSettings extends OkaeriConfig {
     @Comment("# Set true, If you want add cooldown to pearls")
     public boolean pearlCooldownEnabled = false;
 
+    @Comment("# Set true, If you want to reset timer when player throws ender pearl")
+    public boolean pearlExtendsCombatTag = false;
+
     @Comment({
         "# Block throwing pearls with delay?",
         "# If you set this to for example 3s, player will have to wait 3 seconds before throwing another pearl"
@@ -28,12 +30,12 @@ public class FightPearlSettings extends OkaeriConfig {
     public Duration pearlThrowDelay = Duration.ofSeconds(3);
 
     @Comment("# Message sent when player tries to throw ender pearl, but are disabled")
-    public Notice pearlThrowBlockedDuringCombat = BukkitNotice.builder()
+    public Notice pearlThrowBlockedDuringCombat = Notice.builder()
         .chat("<red>Throwing ender pearls is prohibited during combat!")
         .build();
 
     @Comment("# Message sent when player tries to throw ender pearl, but has delay")
-    public Notice pearlThrowBlockedDelayDuringCombat = BukkitNotice.builder()
+    public Notice pearlThrowBlockedDelayDuringCombat = Notice.builder()
         .chat("<red>You must wait {TIME} before next throw!")
         .build();
 

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/spear/SpearLungeController.java

@@ -0,0 +1,93 @@
+package com.eternalcode.combat.fight.spear;
+
+import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.fight.FightManager;
+import com.eternalcode.combat.notification.NoticeService;
+import com.eternalcode.combat.util.DurationUtil;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.plugin.Plugin;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.UUID;
+
+public class SpearLungeController implements Listener {
+
+    private final SpearService spearService;
+
+    public SpearLungeController(
+        Plugin plugin,
+        FightManager fightManager,
+        SpearService spearService,
+        PluginConfig config,
+        NoticeService noticeService
+    ) {
+        this.spearService = spearService;
+
+        try {
+            Class<? extends Event> lungeEventClass = Class.forName("io.papermc.paper.event.entity.EntityLungeEvent").asSubclass(Event.class);
+            MethodHandles.Lookup lookup = MethodHandles.lookup();
+
+            MethodHandle getEntityHandle = lookup.findVirtual(lungeEventClass, "getEntity", MethodType.methodType(Entity.class));
+            MethodHandle setCancelledHandle = lookup.findVirtual(lungeEventClass, "setCancelled", MethodType.methodType(void.class, boolean.class));
+
+            Bukkit.getPluginManager().registerEvent(
+                lungeEventClass,
+                this,
+                EventPriority.NORMAL,
+                (listener, event) -> {
+                    if (!config.spear.lungeCooldown || !lungeEventClass.isInstance(event)) {
+                        return;
+                    }
+
+                    try {
+                        Entity entity = (Entity) getEntityHandle.invoke(event);
+
+                        if (!(entity instanceof Player player)) {
+                            return;
+                        }
+
+                        UUID playerId = player.getUniqueId();
+
+                        if (config.spear.onlyForFight && !fightManager.isInCombat(playerId)) {
+                            return;
+                        }
+
+                        if (this.spearService.isOnCooldown(playerId)) {
+                            setCancelledHandle.invoke(event, true);
+
+                            noticeService.create()
+                                .player(playerId)
+                                .notice(config.spear.lungeOnCooldown)
+                                .placeholder("{TIME}", DurationUtil.format(spearService.getRemainingCooldown(playerId), !config.spear.useMillis))
+                                .send();
+
+                            return;
+                        }
+                        spearService.saveCooldown(playerId);
+                    } catch (Throwable e) {
+                        plugin.getLogger().warning("Failed to handle EntityLungeEvent: " + e.getMessage());
+                    }
+                },
+                plugin
+            );
+        } catch (ClassNotFoundException e) {
+            // Silently ignore: Server version is too old to have EntityLungeEvent
+        } catch (Throwable e) {
+            plugin.getLogger().warning("Failed to hook EntityLungeEvent: " + e.getMessage());
+        }
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        this.spearService.removeCooldown(event.getPlayer().getUniqueId());
+    }
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/spear/SpearServiceImpl.java

@@ -0,0 +1,49 @@
+package com.eternalcode.combat.fight.spear;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class SpearServiceImpl implements SpearService {
+
+    private final SpearSettings settings;
+    private final Map<UUID, Instant> cooldowns = new ConcurrentHashMap<>();
+
+    public SpearServiceImpl(SpearSettings settings) {
+        this.settings = settings;
+    }
+
+    @Override
+    public boolean isOnCooldown(UUID uuid) {
+        return !this.getRemainingCooldown(uuid).isZero();
+    }
+
+    @Override
+    public void saveCooldown(UUID uuid) {
+        this.cooldowns.put(uuid, Instant.now().plus(this.settings.lungeCooldownDuration));
+    }
+
+    @Override
+    public Duration getRemainingCooldown(UUID uuid) {
+        Instant expiration = this.cooldowns.get(uuid);
+
+        if (expiration == null) {
+            return Duration.ZERO;
+        }
+
+        Instant now = Instant.now();
+        if (now.isAfter(expiration)) {
+            this.cooldowns.remove(uuid);
+            return Duration.ZERO;
+        }
+
+        return Duration.between(now, expiration);
+    }
+
+    @Override
+    public void removeCooldown(UUID uuid) {
+        this.cooldowns.remove(uuid);
+    }
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/spear/SpearSettings.java

@@ -0,0 +1,30 @@
+package com.eternalcode.combat.fight.spear;
+
+import com.eternalcode.multification.notice.Notice;
+import eu.okaeri.configs.OkaeriConfig;
+import eu.okaeri.configs.annotation.Comment;
+import java.time.Duration;
+
+public class SpearSettings extends OkaeriConfig {
+
+    @Comment("# Should spears have lunge cooldown or delay between uses? True for cooldown, False for vanilla mechanics")
+    public boolean lungeCooldown = false;
+
+    @Comment("# Should cooldown be applied only during fights")
+    public boolean onlyForFight = true;
+
+    @Comment("# Duration of cooldown")
+    public Duration lungeCooldownDuration = Duration.ofSeconds(5);
+
+    @Comment("# Should milliseconds be used for last second of cooldown for more precise time")
+    public boolean useMillis = true;
+
+    @Comment({
+            "# Notice sent to the players that try to use spears before cooldown ends.",
+            "# Placeholder: {TIME} - time left of cooldown"
+    })
+    public Notice lungeOnCooldown = Notice.builder()
+        .chat("<dark_red>Spear cannot be used for next <red>{TIME}</red></dark_red>")
+        .build();
+
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentController.java

@@ -0,0 +1,146 @@
+package com.eternalcode.combat.fight.trident;
+
+import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.fight.FightManager;
+import com.eternalcode.combat.fight.event.CauseOfTag;
+import com.eternalcode.combat.fight.event.FightUntagEvent;
+import com.eternalcode.combat.notification.NoticeService;
+import com.eternalcode.combat.util.DurationUtil;
+import java.time.Duration;
+import java.util.UUID;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerRiptideEvent;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
+
+public class TridentController implements Listener {
+
+    private final PluginConfig pluginConfig;
+    private final NoticeService noticeService;
+    private final FightManager fightManager;
+    private final TridentService tridentService;
+    private final Server server;
+
+    public TridentController(
+        PluginConfig pluginConfig,
+        NoticeService noticeService,
+        FightManager fightManager,
+        TridentService tridentService, Server server
+    ) {
+        this.pluginConfig = pluginConfig;
+        this.noticeService = noticeService;
+        this.fightManager = fightManager;
+        this.tridentService = tridentService;
+        this.server = server;
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onRiptideInteract(PlayerInteractEvent event) {
+        if (!this.isRiptideInteract(event)) {
+            return;
+        }
+
+        Player player = event.getPlayer();
+        UUID playerId = player.getUniqueId();
+
+        if (!this.fightManager.isInCombat(playerId)) {
+            return;
+        }
+
+        if (this.pluginConfig.trident.tridentRiptideDisabledDuringCombat) {
+            event.setCancelled(true);
+
+            this.noticeService.create()
+                .player(playerId)
+                .notice(this.pluginConfig.trident.tridentRiptideBlocked)
+                .send();
+            return;
+        }
+
+        if (!this.tridentService.hasDelay(playerId)) {
+            return;
+        }
+
+        event.setCancelled(true);
+    }
+
+    // we need to send message without ignoring canceled event because of riptide cooldown
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void messageOnRiptideCooldown(PlayerInteractEvent event) {
+        if (!this.isRiptideInteract(event)) {
+            return;
+        }
+
+        UUID playerId = event.getPlayer().getUniqueId();
+        if (!this.tridentService.hasDelay(playerId)) {
+            return;
+        }
+
+        Duration remainingDelay = this.tridentService.getRemainingDelay(playerId);
+        this.noticeService.create()
+            .player(playerId)
+            .notice(this.pluginConfig.trident.tridentRiptideOnCooldown)
+            .placeholder("{TIME}", DurationUtil.format(remainingDelay))
+            .send();
+    }
+
+    @EventHandler(ignoreCancelled = true)
+    public void onRiptide(PlayerRiptideEvent event) {
+        Player player = event.getPlayer();
+        UUID uniqueId = player.getUniqueId();
+
+        if (this.pluginConfig.trident.tridentRiptideDisabledDuringCombat) {
+            return;
+        }
+
+        if (!this.fightManager.isInCombat(uniqueId)) {
+            return;
+        }
+
+        if (this.tridentService.hasDelay(uniqueId)) {
+            return;
+        }
+
+        this.tridentService.markDelay(player.getUniqueId());
+        player.setCooldown(Material.TRIDENT, (int) this.pluginConfig.trident.tridentRiptideDelay.toMillis() / 50);
+
+        if (this.pluginConfig.trident.tridentRiptideExtendsCombatTag) {
+            this.fightManager.tag(uniqueId, this.pluginConfig.settings.combatTimerDuration, CauseOfTag.TRIDENT);
+        }
+    }
+
+    @EventHandler(ignoreCancelled = true)
+    public void onUntag(FightUntagEvent event) {
+        Player player = server.getPlayer(event.getPlayer());
+        player.setCooldown(Material.TRIDENT, 0);
+        this.tridentService.removeDelay(player.getUniqueId());
+    }
+
+    private boolean isRiptideInteract(PlayerInteractEvent event) {
+        EquipmentSlot hand = event.getHand();
+        if (hand != EquipmentSlot.HAND && hand != EquipmentSlot.OFF_HAND) {
+            return false;
+        }
+
+        Action action = event.getAction();
+        if (action != Action.RIGHT_CLICK_AIR && action != Action.RIGHT_CLICK_BLOCK) {
+            return false;
+        }
+
+        return this.isRiptideTrident(event.getItem());
+    }
+
+    private boolean isRiptideTrident(ItemStack itemStack) {
+        return itemStack != null
+            && itemStack.getType() == Material.TRIDENT
+            && itemStack.containsEnchantment(Enchantment.RIPTIDE);
+    }
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentServiceImpl.java

@@ -0,0 +1,41 @@
+package com.eternalcode.combat.fight.trident;
+
+import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.fight.FightManager;
+import com.eternalcode.commons.delay.Delay;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import java.time.Duration;
+import java.util.UUID;
+
+public class TridentServiceImpl implements TridentService {
+
+    private final Delay<UUID> delay;
+
+    public TridentServiceImpl(PluginConfig pluginConfig) {
+        this.delay = Delay.withDefault(() -> pluginConfig.trident.tridentRiptideDelay);
+    }
+
+
+    @Override
+    public void markDelay(UUID uuid) {
+        this.delay.markDelay(uuid);
+    }
+
+    @Override
+    public boolean hasDelay(UUID uuid) {
+        return this.delay.hasDelay(uuid);
+    }
+
+    @Override
+    public void removeDelay(UUID playerId) {
+        this.delay.unmarkDelay(playerId);
+    }
+
+    @Override
+    public Duration getRemainingDelay(UUID uuid) {
+        return this.delay.getRemaining(uuid);
+    }
+}
+

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentSettings.java

@@ -0,0 +1,39 @@
+package com.eternalcode.combat.fight.trident;
+
+import com.eternalcode.multification.notice.Notice;
+import eu.okaeri.configs.OkaeriConfig;
+import eu.okaeri.configs.annotation.Comment;
+
+import java.time.Duration;
+
+public class TridentSettings extends OkaeriConfig {
+
+    @Comment({
+        "# Set to true to disable riptide usage during combat",
+        "# This setting works globally, but can be overridden by region settings"
+    })
+    public boolean tridentRiptideDisabledDuringCombat = false;
+
+    @Comment("# Set to true so then riptide usage during combat will extend combat tag duration, works only if riptide usage is not disabled")
+    public boolean tridentRiptideExtendsCombatTag = false;
+
+    @Comment({
+        "# Should riptide enchantment be on cooldown during combat?",
+        "# Setting this option to 3s will make players wait 3 seconds between trident throws",
+        "# Setting this to 0s or below will remove cooldown"
+    })
+    public Duration tridentRiptideDelay = Duration.ofSeconds(10);
+
+    @Comment("# Message shown when riptide is blocked during combat")
+    public Notice tridentRiptideBlocked = Notice.builder()
+        .chat("<red>Using riptide is prohibited during combat!")
+        .build();
+
+    @Comment({
+        "# Message sent to the player when riptide is on cooldown",
+        "# Available placeholder: {TIME} - remaining time left to use riptide again"
+    })
+    public Notice tridentRiptideOnCooldown = Notice.builder()
+        .chat("<red>You must wait {TIME} before next riptide!")
+        .build();
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/notification/NoticeService.java

@@ -2,24 +2,20 @@ package com.eternalcode.combat.notification;
 
 import com.eternalcode.combat.config.implementation.PluginConfig;
 import com.eternalcode.multification.adventure.AudienceConverter;
-import com.eternalcode.multification.bukkit.BukkitMultification;
+import com.eternalcode.multification.paper.PaperMultification;
 import com.eternalcode.multification.translation.TranslationProvider;
-import net.kyori.adventure.platform.AudienceProvider;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.ComponentSerializer;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-public final class NoticeService extends BukkitMultification<PluginConfig> {
+public final class NoticeService extends PaperMultification<PluginConfig> {
 
-    private final AudienceProvider audienceProvider;
     private final PluginConfig pluginConfig;
     private final MiniMessage miniMessage;
 
-    public NoticeService(AudienceProvider audienceProvider, PluginConfig pluginConfig, MiniMessage miniMessage) {
-        this.audienceProvider = audienceProvider;
+    public NoticeService(PluginConfig pluginConfig, MiniMessage miniMessage) {
         this.pluginConfig = pluginConfig;
         this.miniMessage = miniMessage;
     }
@@ -36,13 +32,7 @@ public final class NoticeService extends BukkitMultification<PluginConfig> {
 
     @Override
     protected @NotNull AudienceConverter<CommandSender> audienceConverter() {
-        return commandSender -> {
-            if (commandSender instanceof Player player) {
-                return this.audienceProvider.player(player.getUniqueId());
-            }
-
-            return this.audienceProvider.console();
-        };
+        return commandSender -> commandSender;
 
     }
 }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/griefprevention/GriefPreventionRegion.java

@@ -0,0 +1,34 @@
+package com.eternalcode.combat.region.griefprevention;
+
+import com.eternalcode.combat.region.Point;
+import com.eternalcode.combat.region.Region;
+import me.ryanhamshire.GriefPrevention.Claim;
+import org.bukkit.Location;
+import org.bukkit.World;
+
+record GriefPreventionRegion(World world, Claim claim) implements Region {
+
+    @Override
+    public Point getCenter() {
+        Location min = this.claim.getLesserBoundaryCorner();
+        Location max = this.claim.getGreaterBoundaryCorner();
+
+        double x = (min.getX() + max.getX()) / 2.0;
+        double z = (min.getZ() + max.getZ()) / 2.0;
+
+        return new Point(this.world, x, z);
+    }
+
+    @Override
+    public Location getMin() {
+        Location min = this.claim.getLesserBoundaryCorner();
+        return new Location(this.world, min.getBlockX(), this.world.getMinHeight(), min.getBlockZ());
+    }
+
+    @Override
+    public Location getMax() {
+        Location max = this.claim.getGreaterBoundaryCorner();
+        return new Location(this.world, max.getBlockX(), this.world.getMaxHeight() - 1, max.getBlockZ());
+    }
+
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/griefprevention/GriefPreventionRegionProvider.java

@@ -0,0 +1,93 @@
+package com.eternalcode.combat.region.griefprevention;
+
+import com.eternalcode.combat.config.implementation.PluginConfig;
+import com.eternalcode.combat.region.Region;
+import com.eternalcode.combat.region.RegionProvider;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.List;
+import java.util.Optional;
+import java.util.TreeSet;
+import me.ryanhamshire.GriefPrevention.Claim;
+import me.ryanhamshire.GriefPrevention.GriefPrevention;
+import org.bukkit.Location;
+import org.bukkit.World;
+
+public class GriefPreventionRegionProvider implements RegionProvider {
+
+    private final TreeSet<String> claims = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+    private final PluginConfig pluginConfig;
+
+    public GriefPreventionRegionProvider(PluginConfig pluginConfig) {
+        this.claims.addAll(pluginConfig.regions.blockedRegions);
+        this.pluginConfig = pluginConfig;
+    }
+
+    @Override
+    public Optional<Region> getRegion(Location location) {
+        Claim claim = GriefPrevention.instance.dataStore.getClaimAt(location, true, null);
+
+        if (claim == null || !this.isCombatClaim(claim)) {
+            return Optional.empty();
+        }
+
+        return Optional.of(new GriefPreventionRegion(location.getWorld(), claim));
+    }
+
+    @Override
+    public Collection<Region> getRegions(World world) {
+        List<Region> regions = new ArrayList<>();
+
+        for (Claim claim : this.snapshotClaims()) {
+            if (!world.equals(claim.getLesserBoundaryCorner().getWorld())) {
+                continue;
+            }
+
+            if (this.isCombatClaim(claim)) {
+                regions.add(new GriefPreventionRegion(world, claim));
+            }
+        }
+
+        return regions;
+    }
+
+    private boolean isCombatClaim(Claim claim) {
+        if (this.claims.contains(String.valueOf(claim.getID()))) {
+            return true;
+        }
+
+        if (!this.pluginConfig.regions.preventPvpInRegions) {
+            return false;
+        }
+
+        World world = claim.getLesserBoundaryCorner().getWorld();
+        GriefPrevention griefPrevention = GriefPrevention.instance;
+
+        if (world == null || !griefPrevention.pvpRulesApply(world)) {
+            return false;
+        }
+
+        if (!claim.isAdminClaim()) {
+            return griefPrevention.config_pvp_noCombatInPlayerLandClaims;
+        }
+
+        if (claim.parent == null) {
+            return griefPrevention.config_pvp_noCombatInAdminLandClaims;
+        }
+
+        return griefPrevention.config_pvp_noCombatInAdminSubdivisions;
+    }
+
+    // GriefPrevention returns a live view of its claim list, and the border index reads regions asynchronously.
+    // A failed snapshot is retried by the next border index refresh, so an empty result is safe here.
+    private List<Claim> snapshotClaims() {
+        try {
+            return List.copyOf(GriefPrevention.instance.dataStore.getClaims());
+        }
+        catch (ConcurrentModificationException exception) {
+            return List.of();
+        }
+    }
+
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/worldguard/WorldGuardRegion.java

@@ -8,13 +8,14 @@ import org.bukkit.Location;
 import org.bukkit.World;
 
 record WorldGuardRegion(World world, ProtectedRegion region) implements Region {
+
     @Override
     public Point getCenter() {
         BlockVector3 min = this.region.getMinimumPoint();
         BlockVector3 max = this.region.getMaximumPoint();
 
-        double x = (double) (min.getX() + max.getX()) / 2;
-        double z = (double) (min.getZ() + max.getZ()) / 2;
+        double x = (min.x() + max.x()) / 2.0;
+        double z = (min.z() + max.z()) / 2.0;
 
         return new Point(this.world, x, z);
     }
@@ -22,12 +23,13 @@ record WorldGuardRegion(World world, ProtectedRegion region) implements Region {
     @Override
     public Location getMin() {
         BlockVector3 min = this.region.getMinimumPoint();
-        return new Location(this.world, min.getX(), min.getY(), min.getZ());
+        return new Location(this.world, min.x(), min.y(), min.z());
     }
 
     @Override
     public Location getMax() {
         BlockVector3 max = this.region.getMaximumPoint();
-        return new Location(this.world, max.getX(), max.getY(), max.getZ());
+        return new Location(this.world, max.x(), max.y(), max.z());
     }
+
 }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/updater/UpdaterNotificationController.java

@@ -2,8 +2,6 @@ package com.eternalcode.combat.updater;
 
 import com.eternalcode.combat.config.implementation.PluginConfig;
 import com.eternalcode.commons.concurrent.FutureHandler;
-import net.kyori.adventure.audience.Audience;
-import net.kyori.adventure.platform.AudienceProvider;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -16,20 +14,17 @@ public class UpdaterNotificationController implements Listener {
 
     private final UpdaterService updaterService;
     private final PluginConfig pluginConfig;
-    private final AudienceProvider audienceProvider;
     private final MiniMessage miniMessage;
 
-    public UpdaterNotificationController(UpdaterService updaterService, PluginConfig pluginConfig, AudienceProvider audienceProvider, MiniMessage miniMessage) {
+    public UpdaterNotificationController(UpdaterService updaterService, PluginConfig pluginConfig, MiniMessage miniMessage) {
         this.updaterService = updaterService;
         this.pluginConfig = pluginConfig;
-        this.audienceProvider = audienceProvider;
         this.miniMessage = miniMessage;
     }
 
     @EventHandler
     void onJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
-        Audience audience = this.audienceProvider.player(player.getUniqueId());
 
         if (!shouldNotify(player)) {
             return;
@@ -38,7 +33,7 @@ public class UpdaterNotificationController implements Listener {
         this.updaterService.checkForUpdate()
             .thenAccept(result -> {
                 if (result.isUpdateAvailable()) {
-                    audience.sendMessage(this.miniMessage.deserialize(NEW_VERSION_AVAILABLE));
+                    player.sendMessage(this.miniMessage.deserialize(NEW_VERSION_AVAILABLE));
                 }
             })
             .exceptionally(FutureHandler::handleException);

eternalcombat-plugin/src/main/java/com/eternalcode/combat/util/ReflectUtil.java

@@ -1,27 +0,0 @@
-package com.eternalcode.combat.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public final class ReflectUtil {
-
-    private ReflectUtil() {
-    }
-
-    @SuppressWarnings("unchecked")
-    public static  <T> T invokeMethod(Object object, String name) {
-        try {
-            if (object == null) {
-                return null;
-            }
-
-            Method method = object.getClass().getDeclaredMethod(name);
-            method.setAccessible(true);
-            return (T) method.invoke(object);
-        }
-        catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException exception) {
-            throw new RuntimeException(exception);
-        }
-    }
-
-}

eternalcombat-plugin/test/com/eternalcode/combat/config/implementation/SignEditingSettingsTest.java

@@ -0,0 +1,15 @@
+package com.eternalcode.combat.config.implementation;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.junit.jupiter.api.Test;
+
+class SignEditingSettingsTest {
+
+    @Test
+    void shouldDisableSignEditingBlockerByDefault() {
+        SignEditingSettings signEditingSettings = new SignEditingSettings();
+
+        assertFalse(signEditingSettings.disableSignEditingDuringCombat);
+    }
+}

eternalcombat-plugin/test/com/eternalcode/combat/fight/blocker/SignEditingBlockerTest.java

@@ -0,0 +1,34 @@
+package com.eternalcode.combat.fight.blocker;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.bukkit.Material;
+import org.junit.jupiter.api.Test;
+
+class SignEditingBlockerTest {
+
+    @Test
+    void shouldRecognizeStandingSignMaterials() {
+        assertTrue(SignEditingBlocker.isSign(Material.OAK_SIGN));
+        assertTrue(SignEditingBlocker.isSign(Material.CRIMSON_SIGN));
+    }
+
+    @Test
+    void shouldRecognizeWallSignMaterials() {
+        assertTrue(SignEditingBlocker.isSign(Material.OAK_WALL_SIGN));
+        assertTrue(SignEditingBlocker.isSign(Material.WARPED_WALL_SIGN));
+    }
+
+    @Test
+    void shouldIgnoreNonSignMaterials() {
+        assertFalse(SignEditingBlocker.isSign(Material.CHEST));
+        assertFalse(SignEditingBlocker.isSign(Material.ENDER_PEARL));
+    }
+
+    @Test
+    void shouldRecognizeEnderPearlMaterial() {
+        assertTrue(SignEditingBlocker.isEnderPearl(Material.ENDER_PEARL));
+        assertFalse(SignEditingBlocker.isEnderPearl(Material.OAK_SIGN));
+    }
+}

gradle.properties

@@ -4,4 +4,4 @@ org.gradle.configuration-cache=true
 org.gradle.configuration-cache.parallel=true
 
 # Platforms
-paperVersion=1.17,1.17.1,1.18,1.18.1,1.18.2,1.19,1.19.1,1.19.2,1.19.3,1.19.4,1.20,1.20.1,1.20.2,1.20.3,1.20.4,1.20.5,1.20.6,1.21,1.21.1,1.21.2,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8,1.21.9,1.21.10,1.21.11
+paperVersion=1.19.3,1.19.4,1.20,1.20.1,1.20.2,1.20.4,1.20.5,1.20.6,1.21,1.21.1,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8,1.21.9,1.21.10,1.21.11,26.1.1,26.1.2,26.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -19,12 +19,12 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,29 +65,18 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
 
 
 
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%