From 4a1734c61a3867ba16f6c19dd2dcee1f70f63bcd Mon Sep 17 00:00:00 2001
From: Igor Michalski <65646893+igoyek@users.noreply.github.com>
Date: Thu, 21 Aug 2025 09:31:30 +0200
Subject: [PATCH 01/11] Add jail command restriction type and refactor config

Introduced JailCommandRestrictionType enum to support both whitelist and blacklist command restrictions for jailed players. Updated JailConfig and JailSettings to use 'restrictedCommands' and 'restrictionType' instead of 'allowedCommands'. Modified JailController logic to handle both restriction types.

Took 12 minutes
---
 .../core/feature/jail/JailCommandRestrictionType.java    | 6 ++++++
 .../com/eternalcode/core/feature/jail/JailConfig.java    | 7 +++++--
 .../eternalcode/core/feature/jail/JailController.java    | 9 ++++++++-
 .../com/eternalcode/core/feature/jail/JailSettings.java  | 5 +++--
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommandRestrictionType.java

diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommandRestrictionType.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommandRestrictionType.java
new file mode 100644
index 000000000..68e1cec34
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommandRestrictionType.java
@@ -0,0 +1,6 @@
+package com.eternalcode.core.feature.jail;
+
+public enum JailCommandRestrictionType {
+    WHITELIST,
+    BLACKLIST
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailConfig.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailConfig.java
index d32d0719a..4fac04d56 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailConfig.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailConfig.java
@@ -14,6 +14,9 @@ public class JailConfig extends OkaeriConfig implements JailSettings {
     @Comment("# Default jail duration, set if no duration is specified")
     public Duration defaultJailDuration = Duration.ofMinutes(30);
 
-    @Comment("# Allowed commands in jail")
-    public Set<String> allowedCommands = Set.of("help", "msg", "r", "tell", "me", "helpop");
+    @Comment("# Command restriction type, either WHITELIST or BLACKLIST")
+    public JailCommandRestrictionType restrictionType = JailCommandRestrictionType.WHITELIST;
+
+    @Comment("# Restricted commands for jailed players")
+    public Set<String> restrictedCommands = Set.of("help", "msg", "r", "tell", "me", "helpop");
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailController.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailController.java
index 8116906b4..1282f9487 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailController.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailController.java
@@ -45,8 +45,15 @@ public void onPlayerPreCommand(PlayerCommandPreprocessEvent event) {
         }
 
         String command = event.getMessage().split(" ")[0].substring(1);
+        Set<String> restrictedCommands = this.jailSettings.restrictedCommands();
+        JailCommandRestrictionType restrictionType = this.jailSettings.restrictionType();
 
-        if (this.jailSettings.allowedCommands().contains(command)) {
+        boolean shouldBlockCommand = switch (restrictionType) {
+            case WHITELIST -> !restrictedCommands.contains(command);
+            case BLACKLIST -> restrictedCommands.contains(command);
+        };
+
+        if (!shouldBlockCommand) {
             return;
         }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailSettings.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailSettings.java
index 594b72d3c..00bb48cd8 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailSettings.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailSettings.java
@@ -1,13 +1,14 @@
 package com.eternalcode.core.feature.jail;
 
 import java.time.Duration;
-import java.util.List;
 import java.util.Set;
 
 public interface JailSettings {
 
     Duration defaultJailDuration();
 
-    Set<String> allowedCommands();
+    JailCommandRestrictionType restrictionType();
+
+    Set<String> restrictedCommands();
 
 }

From ad0b8c222cd33919dc7d1dd05309b29b24b7d945 Mon Sep 17 00:00:00 2001
From: Igor Michalski <65646893+igoyek@users.noreply.github.com>
Date: Thu, 21 Aug 2025 11:03:48 +0200
Subject: [PATCH 02/11] The prison system has been improved
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added a record of the player's previous location.
Configuration values ​​and messages have been migrated.
Added constant permission values ​​and used static imports for better appearance.
Other cosmetic or quality improvements have been made.

Took 49 minutes
---
 .../core/feature/jail/JailedPlayer.java       | 19 ++++-
 ...e_allowed_to_restricted_jail_commands.java | 13 ++++
 ...n_0010_Move_jail_to_dedicated_section.java | 37 +++++++++
 .../configuration/migrations/Migrations.java  |  3 +-
 .../core/feature/jail/JailCommand.java        | 76 +++++++++----------
 .../core/feature/jail/JailController.java     |  2 +-
 .../feature/jail/JailPermissionConstant.java  | 41 ++++++++++
 .../core/feature/jail/JailServiceImpl.java    | 38 ++++++----
 .../core/feature/jail/JailTask.java           |  4 +-
 .../core/feature/jail/PrisonerTable.java      | 17 ++++-
 .../feature/jail/messages/ENJailMessages.java | 36 ++++-----
 .../feature/jail/messages/JailMessages.java   | 36 ++++-----
 .../feature/jail/messages/PLJailMessages.java | 36 ++++-----
 .../core/translation/Translation.java         |  2 +-
 .../implementation/ENTranslation.java         |  3 +-
 .../implementation/PLTranslation.java         |  5 +-
 16 files changed, 248 insertions(+), 120 deletions(-)
 create mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0009_Rename_allowed_to_restricted_jail_commands.java
 create mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Move_jail_to_dedicated_section.java
 create mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailPermissionConstant.java

diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
index 4a8d62a1b..83855376b 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
@@ -1,5 +1,8 @@
 package com.eternalcode.core.feature.jail;
 
+import org.bukkit.Location;
+import org.jetbrains.annotations.Nullable;
+
 import java.time.Duration;
 import java.time.Instant;
 import java.util.UUID;
@@ -10,12 +13,19 @@ public class JailedPlayer {
     private final Instant detainedAt;
     private final Duration prisonTime;
     private final String detainedBy;
+    @Nullable
+    private final Location lastLocation;
+
+    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String detainedBy) {
+        this(player, detainedAt, prisonTime, detainedBy, null);
+    }
 
-    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String lockedUpBy) {
+    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String detainedBy, @Nullable Location lastLocation) {
         this.player = player;
         this.detainedAt = detainedAt;
         this.prisonTime = prisonTime;
-        this.detainedBy = lockedUpBy;
+        this.detainedBy = detainedBy;
+        this.lastLocation = lastLocation;
     }
     
     public UUID getPlayerUniqueId() {
@@ -34,6 +44,11 @@ public Duration getPrisonTime() {
         return this.prisonTime;
     }
 
+    @Nullable
+    public Location getLastLocation() {
+        return this.lastLocation;
+    }
+
     public boolean isPrisonExpired() {
         return this.detainedAt.plus(this.prisonTime).isBefore(Instant.now());
     }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0009_Rename_allowed_to_restricted_jail_commands.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0009_Rename_allowed_to_restricted_jail_commands.java
new file mode 100644
index 000000000..7b9a28a21
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0009_Rename_allowed_to_restricted_jail_commands.java
@@ -0,0 +1,13 @@
+package com.eternalcode.core.configuration.migrations;
+
+import static eu.okaeri.configs.migrate.ConfigMigrationDsl.move;
+import eu.okaeri.configs.migrate.builtin.NamedMigration;
+
+class Migration_0009_Rename_allowed_to_restricted_jail_commands extends NamedMigration {
+
+    Migration_0009_Rename_allowed_to_restricted_jail_commands() {
+        super("Rename allowed to restricted jail commands",
+            move("jail.allowedCommands", "jail.restrictedCommands")
+        );
+    }
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Move_jail_to_dedicated_section.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Move_jail_to_dedicated_section.java
new file mode 100644
index 000000000..b81fe58e4
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Move_jail_to_dedicated_section.java
@@ -0,0 +1,37 @@
+package com.eternalcode.core.configuration.migrations;
+
+import eu.okaeri.configs.migrate.builtin.NamedMigration;
+
+import static eu.okaeri.configs.migrate.ConfigMigrationDsl.move;
+
+public class Migration_0010_Move_jail_to_dedicated_section extends NamedMigration {
+
+    Migration_0010_Move_jail_to_dedicated_section() {
+        super(
+            "Move jail to dedicated section",
+
+            move("jailSection.jailLocationSet", "jail.locationSet"),
+            move("jailSection.jailLocationRemove", "jail.locationRemove"),
+            move("jailSection.jailLocationNotSet", "jail.locationNotSet"),
+            move("jailSection.jailLocationOverride", "jail.locationOverride"),
+
+            move("jailSection.jailDetainBroadcast", "jail.detainBroadcast"),
+            move("jailSection.jailDetainPrivate", "jail.detainPrivate"),
+            move("jailSection.jailDetainCountdown", "jail.detainCountdown"),
+            move("jailSection.jailDetainOverride", "jail.detainOverride"),
+            move("jailSection.jailDetainAdmin", "jail.detainAdmin"),
+
+            move("jailSection.jailReleaseBroadcast", "jail.releaseBroadcast"),
+            move("jailSection.jailReleasePrivate", "jail.releasePrivate"),
+            move("jailSection.jailReleaseAll", "jail.releaseAll"),
+            move("jailSection.jailReleaseNoPlayers", "jail.releaseNoPlayers"),
+            move("jailSection.jailIsNotPrisoner", "jail.isNotPrisoner"),
+
+            move("jailSection.jailListHeader", "jail.listHeader"),
+            move("jailSection.jailListEmpty", "jail.listEmpty"),
+            move("jailSection.jailListPlayerEntry", "jail.listPlayerEntry"),
+
+            move("jailSection.jailCannotUseCommand", "jail.cannotUseCommand")
+        );
+    }
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
index fc15363ae..fcc34b2b6 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
@@ -10,7 +10,8 @@ public class Migrations {
         new Migration_0003_Move_tprp_to_dedicated_section(),
         new Migration_0006_Move_alert_to_broadcast_section(),
         new Migration_0007_Move_clear_to_dedicated_section(),
-        new Migration_0008_Move_repair_to_dedicated_section()
+        new Migration_0008_Move_repair_to_dedicated_section(),
+        new Migration_0009_Rename_allowed_to_restricted_jail_commands(),
     };
 
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java
index 7e4358954..1fc8b92b8 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java
@@ -1,7 +1,12 @@
 package com.eternalcode.core.feature.jail;
 
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_BYPASS_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_DETAIN_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_LIST_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_RELEASE_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_SETUP_PERMISSION;
+
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
-import com.eternalcode.annotations.scan.permission.PermissionDocs;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.util.DurationUtil;
@@ -11,21 +16,16 @@
 import dev.rollczi.litecommands.annotations.context.Context;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import java.time.Duration;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+import java.time.Duration;
+
 @Command(name = "jail")
-@PermissionDocs(
-    name = "Jail Bypass",
-    permission = JailCommand.JAIL_BYPASS,
-    description = "Permission allows to bypass jail punishment"
-)
+@Permission(JAIL_BYPASS_PERMISSION)
 class JailCommand {
 
-    static final String JAIL_BYPASS = "eternalcore.jail.bypass";
-
     private final JailService jailService;
     private final NoticeService noticeService;
     private final JailSettings jailSettings;
@@ -41,7 +41,7 @@ class JailCommand {
 
     @Async
     @Execute(name = "setup")
-    @Permission("eternalcore.jail.setup")
+    @Permission(JAIL_SETUP_PERMISSION)
     @DescriptionDocs(description = "Define jail spawn area")
     void executeJailSetup(@Context Player player) {
         Location location = player.getLocation();
@@ -51,15 +51,15 @@ void executeJailSetup(@Context Player player) {
 
         this.noticeService.create()
             .notice(translation -> (isLastJailSet
-                ? translation.jailSection().jailLocationOverride()
-                : translation.jailSection().jailLocationSet()))
+                ? translation.jail().locationOverride()
+                : translation.jail().locationSet()))
             .player(player.getUniqueId())
             .send();
     }
 
     @Async
     @Execute(name = "setup")
-    @Permission("eternalcore.jail.setup")
+    @Permission(JAIL_SETUP_PERMISSION)
     @DescriptionDocs(description = "Define jail spawn area", arguments = "<location>")
     void executeJailSetup(@Context Player player, @Arg Location location) {
         boolean isLastJailSet = this.jailService.getJailAreaLocation().isPresent();
@@ -69,15 +69,15 @@ void executeJailSetup(@Context Player player, @Arg Location location) {
 
         this.noticeService.create()
             .notice(translation -> (isLastJailSet
-                ? translation.jailSection().jailLocationOverride()
-                : translation.jailSection().jailLocationSet()))
+                ? translation.jail().locationOverride()
+                : translation.jail().locationSet()))
             .player(player.getUniqueId())
             .send();
     }
 
     @Async
     @Execute(name = "remove")
-    @Permission("eternalcore.jail.setup")
+    @Permission(JAIL_SETUP_PERMISSION)
     @DescriptionDocs(description = "Remove jail spawn area")
     void executeJailRemove(@Context Player player) {
         if (this.isPrisonAvailable(player)) {
@@ -87,36 +87,36 @@ void executeJailRemove(@Context Player player) {
         this.jailService.removeJailArea();
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailLocationRemove())
+            .notice(translation -> translation.jail().locationRemoved())
             .player(player.getUniqueId())
             .send();
     }
 
     @Execute(name = "detain")
-    @Permission("eternalcore.jail.detain")
+    @Permission(JAIL_DETAIN_PERMISSION)
     @DescriptionDocs(description = "Detain self")
     void executeJailDetainSelf(@Context Player player) {
         this.executeJailDetainForTime(player, player, this.jailSettings.defaultJailDuration());
     }
 
     @Execute(name = "detain")
-    @Permission("eternalcore.jail.detain")
+    @Permission(JAIL_DETAIN_PERMISSION)
     @DescriptionDocs(description = "Detain a player", arguments = "<player>")
     void executeJailDetain(@Context Player player, @Arg Player target) {
         this.executeJailDetainForTime(player, target, this.jailSettings.defaultJailDuration());
     }
 
     @Execute(name = "detain")
-    @Permission("eternalcore.jail.detain")
+    @Permission(JAIL_DETAIN_PERMISSION)
     @DescriptionDocs(description = "Detain a player for some time", arguments = "<player> <time>")
     void executeJailDetainForTime(@Context Player player, @Arg Player target, @Arg Duration duration) {
         if (this.isPrisonAvailable(player)) {
             return;
         }
 
-        if (target.hasPermission(JAIL_BYPASS)) {
+        if (target.hasPermission(JAIL_BYPASS_PERMISSION)) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailDetainAdmin())
+                .notice(translation -> translation.jail().detainAdmin())
                 .placeholder("{PLAYER}", target.getName())
                 .player(player.getUniqueId())
                 .send();
@@ -127,7 +127,7 @@ void executeJailDetainForTime(@Context Player player, @Arg Player target, @Arg D
 
         if (isPlayerJailed) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailDetainOverride())
+                .notice(translation -> translation.jail().detainOverride())
                 .placeholder("{PLAYER}", target.getName())
                 .player(player.getUniqueId())
                 .send();
@@ -136,31 +136,31 @@ void executeJailDetainForTime(@Context Player player, @Arg Player target, @Arg D
         this.jailService.detainPlayer(target, player, duration);
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailDetainBroadcast())
+            .notice(translation -> translation.jail().detainBroadcast())
             .placeholder("{PLAYER}", target.getName())
             .all()
             .send();
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailDetainPrivate())
+            .notice(translation -> translation.jail().detainPrivate())
             .player(target.getUniqueId())
             .send();
     }
 
     @Execute(name = "release")
-    @Permission("eternalcore.jail.release")
+    @Permission(JAIL_RELEASE_PERMISSION)
     @DescriptionDocs(description = "Release self from jail")
     void executeJailReleaseSelf(@Context Player player) {
         this.executeJailRelease(player, player);
     }
 
     @Execute(name = "release")
-    @Permission("eternalcore.jail.release")
+    @Permission(JAIL_RELEASE_PERMISSION)
     @DescriptionDocs(description = "Release a player from jail", arguments = "<player>")
     void executeJailRelease(@Context Player player, @Arg Player target) {
         if (!this.jailService.isPlayerJailed(target.getUniqueId())) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailIsNotPrisoner())
+                .notice(translation -> translation.jail().isNotPrisoner())
                 .placeholder("{PLAYER}", target.getName())
                 .player(player.getUniqueId())
                 .send();
@@ -170,24 +170,24 @@ void executeJailRelease(@Context Player player, @Arg Player target) {
         this.jailService.releasePlayer(target);
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailReleasePrivate())
+            .notice(translation -> translation.jail().releasePrivate())
             .player(target.getUniqueId())
             .send();
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailReleaseBroadcast())
+            .notice(translation -> translation.jail().releaseBroadcast())
             .placeholder("{PLAYER}", target.getName())
             .all()
             .send();
     }
 
     @Execute(name = "release -all", aliases = { "release *" })
-    @Permission("eternalcore.jail.release")
+    @Permission(JAIL_RELEASE_PERMISSION)
     @DescriptionDocs(description = "Release all players from jail")
     void executeJailReleaseAll(@Context Player player) {
         if (this.jailService.getJailedPlayers().isEmpty()) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailReleaseNoPlayers())
+                .notice(translation -> translation.jail().releaseNoPlayers())
                 .player(player.getUniqueId())
                 .send();
             return;
@@ -196,31 +196,31 @@ void executeJailReleaseAll(@Context Player player) {
         this.jailService.releaseAllPlayers();
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailReleaseAll())
+            .notice(translation -> translation.jail().releaseAll())
             .all()
             .send();
     }
 
     @Execute(name = "list")
-    @Permission("eternalcore.jail.list")
+    @Permission(JAIL_LIST_PERMISSION)
     @DescriptionDocs(description = "List all jailed players")
     void executeJailList(@Context Player player) {
         if (this.jailService.getJailedPlayers().isEmpty()) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailListEmpty())
+                .notice(translation -> translation.jail().listEmpty())
                 .player(player.getUniqueId())
                 .send();
             return;
         }
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailListHeader())
+            .notice(translation -> translation.jail().listHeader())
             .player(player.getUniqueId())
             .send();
 
         for (JailedPlayer jailedPlayer : this.jailService.getJailedPlayers()) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailListPlayerEntry())
+                .notice(translation -> translation.jail().listPlayerEntry())
                 .placeholder("{PLAYER}", this.server.getOfflinePlayer(jailedPlayer.getPlayerUniqueId()).getName())
                 .placeholder("{REMAINING_TIME}", DurationUtil.format(jailedPlayer.getRemainingTime(), true))
                 .placeholder("{DETAINED_BY}", jailedPlayer.getDetainedBy())
@@ -232,7 +232,7 @@ void executeJailList(@Context Player player) {
     private boolean isPrisonAvailable(Player player) {
         if (this.jailService.getJailAreaLocation().isEmpty()) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailLocationNotSet())
+                .notice(translation -> translation.jail().locationNotSet())
                 .player(player.getUniqueId())
                 .send();
             return true;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailController.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailController.java
index 1282f9487..0834ff5d9 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailController.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailController.java
@@ -58,7 +58,7 @@ public void onPlayerPreCommand(PlayerCommandPreprocessEvent event) {
         }
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailCannotUseCommand())
+            .notice(translation -> translation.jail().cannotUseCommand())
             .player(player.getUniqueId())
             .send();
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailPermissionConstant.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailPermissionConstant.java
new file mode 100644
index 000000000..db586e911
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailPermissionConstant.java
@@ -0,0 +1,41 @@
+package com.eternalcode.core.feature.jail;
+
+import com.eternalcode.annotations.scan.permission.PermissionDocs;
+
+public class JailPermissionConstant {
+
+    @PermissionDocs(
+        name = "Jail Bypass",
+        permission = JAIL_BYPASS_PERMISSION,
+        description = "Permission allows to bypass jail punishment."
+    )
+    public static final String JAIL_BYPASS_PERMISSION = "eternalcore.jail.bypass";
+
+    @PermissionDocs(
+        name = "Jail Detain",
+        permission = JAIL_DETAIN_PERMISSION,
+        description = "Allows to detain players in jail."
+    )
+    public static final String JAIL_DETAIN_PERMISSION = "eternalcore.jail.detain";
+
+    @PermissionDocs(
+        name = "Jail Release",
+        permission = JAIL_RELEASE_PERMISSION,
+        description = "Allows to release players from jail."
+    )
+    public static final String JAIL_RELEASE_PERMISSION = "eternalcore.jail.release";
+
+    @PermissionDocs(
+        name = "Jail List",
+        permission = JAIL_LIST_PERMISSION,
+        description = "Allows to list all jailed players."
+    )
+    public static final String JAIL_LIST_PERMISSION = "eternalcore.jail.list";
+
+    @PermissionDocs(
+        name = "Jail Setup",
+        permission = JAIL_SETUP_PERMISSION,
+        description = "Permission allows to setup jail area."
+    )
+    public static final String JAIL_SETUP_PERMISSION = "eternalcore.jail.setup";
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
index a5a36155e..92fa76351 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
@@ -84,7 +84,15 @@ public boolean detainPlayer(Player player, CommandSender detainedBy, @Nullable D
             return false;
         }
 
-        JailedPlayer jailedPlayer = new JailedPlayer(player.getUniqueId(), Instant.now(), time, detainedBy.getName());
+        Location lastLocation = player.getLocation();
+
+        JailedPlayer jailedPlayer = new JailedPlayer(
+            player.getUniqueId(),
+            Instant.now(),
+            time,
+            detainedBy.getName(),
+            lastLocation
+        );
 
         this.prisonerRepository.savePrisoner(jailedPlayer);
         this.jailedPlayers.put(player.getUniqueId(), jailedPlayer);
@@ -102,28 +110,36 @@ public boolean releasePlayer(Player player) {
             return false;
         }
 
+        JailedPlayer jailedPlayer = this.jailedPlayers.get(player.getUniqueId());
+
         this.prisonerRepository.deletePrisoner(player.getUniqueId());
         this.jailedPlayers.remove(player.getUniqueId());
 
-        this.spawnService.teleportToSpawn(player);
+        if (jailedPlayer != null && jailedPlayer.getLastLocation() != null) {
+            this.teleportService.teleport(player, jailedPlayer.getLastLocation());
+        } else {
+            this.spawnService.teleportToSpawn(player);
+        }
 
         return true;
     }
 
     @Override
     public void releaseAllPlayers() {
-        this.jailedPlayers.forEach((uuid, prisoner) -> {
-            Player jailedPlayer = this.server.getPlayer(uuid);
+        this.jailedPlayers.forEach((uuid, jailedPlayer) -> {
+            Player player = this.server.getPlayer(uuid);
+
             JailReleaseEvent jailReleaseEvent = new JailReleaseEvent(uuid);
             this.eventCaller.callEvent(jailReleaseEvent);
 
-            if (jailReleaseEvent.isCancelled()) {
+            if (jailReleaseEvent.isCancelled() || player == null) {
                 return;
             }
 
-            if (jailedPlayer != null) {
-                this.teleportService.teleport(jailedPlayer, this.spawnService.getSpawnLocation());
-            }
+            Location targetLocation = Optional.ofNullable(jailedPlayer.getLastLocation())
+                .orElseGet(this.spawnService::getSpawnLocation);
+
+            this.teleportService.teleport(player, targetLocation);
         });
 
         this.jailedPlayers.clear();
@@ -134,11 +150,7 @@ public void releaseAllPlayers() {
     public boolean isPlayerJailed(UUID player) {
         JailedPlayer jailedPlayer = this.jailedPlayers.get(player);
 
-        if (jailedPlayer == null || jailedPlayer.isPrisonExpired()) {
-            return false;
-        }
-
-        return true;
+        return jailedPlayer != null && !jailedPlayer.isPrisonExpired();
     }
 
     @Override
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailTask.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailTask.java
index 31cf90428..bfba8d398 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailTask.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailTask.java
@@ -32,14 +32,14 @@ public void run() {
             }
 
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailDetainCountdown())
+                .notice(translation -> translation.jail().detainCountdown())
                 .placeholder("{REMAINING_TIME}", DurationUtil.format(jailedPlayer.getRemainingTime(), true))
                 .player(jailedPlayer.getPlayerUniqueId())
                 .send();
 
             if (jailedPlayer.isPrisonExpired()) {
                 this.noticeService.create()
-                    .notice(translation -> translation.jailSection().jailReleasePrivate())
+                    .notice(translation -> translation.jail().releasePrivate())
                     .player(jailedPlayer.getPlayerUniqueId())
                     .send();
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
index 05b587d1c..72dc14491 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
@@ -1,8 +1,11 @@
 package com.eternalcode.core.feature.jail;
 
+import com.eternalcode.core.database.persister.LocationPersister;
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
+import org.bukkit.Location;
+import org.jetbrains.annotations.Nullable;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -24,18 +27,27 @@ class PrisonerTable {
     @DatabaseField(columnName = "detained_by")
     private String detainedBy;
 
+    @DatabaseField(columnName = "last_location", persisterClass = LocationPersister.class)
+    @Nullable
+    private Location lastLocation;
+
     PrisonerTable() {
     }
 
     PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy) {
+        this(uuid, detainedAt, duration, detainedBy, null);
+    }
+
+    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy, @Nullable Location lastLocation) {
         this.uuid = uuid;
         this.detainedAt = detainedAt;
         this.duration = duration;
         this.detainedBy = detainedBy;
+        this.lastLocation = lastLocation;
     }
 
     JailedPlayer toPrisoner() {
-        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy);
+        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy, this.lastLocation);
     }
 
     static PrisonerTable from(JailedPlayer jailedPlayer) {
@@ -43,7 +55,8 @@ static PrisonerTable from(JailedPlayer jailedPlayer) {
             jailedPlayer.getPlayerUniqueId(),
             jailedPlayer.getDetainedAt(),
             jailedPlayer.getPrisonTime(),
-            jailedPlayer.getDetainedBy()
+            jailedPlayer.getDetainedBy(),
+            jailedPlayer.getLastLocation()
         );
     }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java
index 946ec7309..ba9addd09 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java
@@ -10,41 +10,41 @@
 @Accessors(fluent = true)
 public class ENJailMessages extends OkaeriConfig implements JailMessages {
     @Comment({" ", "# Section responsible for location of jail setup"})
-    public Notice jailLocationSet = Notice.chat("<green>► <white>Jail location has been set!");
-    public Notice jailLocationRemove = Notice.chat("<red>✘ <dark_red>Jail location has been removed!");
-    public Notice jailLocationNotSet = Notice.chat("<red>✘ <dark_red>Jail location is not set!");
-    public Notice jailLocationOverride = Notice.chat("<green>► <white>Jail location has been overridden!");
+    public Notice locationSet = Notice.chat("<green>► <white>Jail location has been set!");
+    public Notice locationRemoved = Notice.chat("<red>✘ <dark_red>Jail location has been removed!");
+    public Notice locationNotSet = Notice.chat("<red>✘ <dark_red>Jail location is not set!");
+    public Notice locationOverride = Notice.chat("<green>► <white>Jail location has been overridden!");
 
     @Comment({" ", "# Section responsible for detaining players"})
-    public Notice jailDetainPrivate = Notice.chat("<green>► <white>You have been jailed!");
-    public Notice jailCannotUseCommand = Notice.chat("<red>✘ <dark_red>You can't use this command! You are in jail!");
+    public Notice detainPrivate = Notice.chat("<green>► <white>You have been jailed!");
+    public Notice cannotUseCommand = Notice.chat("<red>✘ <dark_red>You can't use this command! You are in jail!");
     @Comment({" ", "# {PLAYER} - Player who has been detained"})
-    public Notice jailDetainOverride =
+    public Notice detainOverride =
         Notice.chat("<green>► <white>You have overridden the jail for <green>{PLAYER} <white>!");
     @Comment({" ", "# {PLAYER} - Player who has been detained"})
-    public Notice jailDetainBroadcast = Notice.chat("<green>► <white>Player <green>{PLAYER} <white>has been jailed!");
+    public Notice detainBroadcast = Notice.chat("<green>► <white>Player <green>{PLAYER} <white>has been jailed!");
     @Comment({" ", "# {REMAINING_TIME} - Time left to release"})
-    public Notice jailDetainCountdown =
+    public Notice detainCountdown =
         Notice.actionbar("<red> You are in jail! <gray>Time left: <red>{REMAINING_TIME}!");
     @Comment({" ", "# {PLAYER} - Admin who you can't detain"})
-    public Notice jailDetainAdmin =
+    public Notice detainAdmin =
         Notice.chat("<red>✘ <dark_red>You can't jail <red>{PLAYER} <dark_red>because he is an admin!");
 
     @Comment({" ", "# Section responsible for releasing players from jail"})
     @Comment({" ", "# {PLAYER} - Player who has been released from jail"})
-    public Notice jailReleaseBroadcast =
+    public Notice releaseBroadcast =
         Notice.chat("<green>► <white>Player <green>{PLAYER} <white>has been granted freedom!");
-    public Notice jailReleasePrivate = Notice.actionbar("<green> You have been released from jail!");
-    public Notice jailReleaseAll = Notice.chat("<green>► <white>All players have been released from jail!");
-    public Notice jailReleaseNoPlayers = Notice.chat("<red>✘ <dark_red>No players found in jail!");
+    public Notice releasePrivate = Notice.actionbar("<green> You have been released from jail!");
+    public Notice releaseAll = Notice.chat("<green>► <white>All players have been released from jail!");
+    public Notice releaseNoPlayers = Notice.chat("<red>✘ <dark_red>No players found in jail!");
     @Comment({" ", "# {PLAYER} - Player nickname"})
-    public Notice jailIsNotPrisoner = Notice.chat("<red>✘ <dark_red>Player {PLAYER} is not a prisoner!");
+    public Notice isNotPrisoner = Notice.chat("<red>✘ <dark_red>Player {PLAYER} is not a prisoner!");
 
     @Comment({" ", "# Section responsible for listing players in jail"})
-    public Notice jailListHeader = Notice.chat("<green>► <white>Players in jail: ");
-    public Notice jailListEmpty = Notice.chat("<red>✘ <dark_red>No players found in jail!");
+    public Notice listHeader = Notice.chat("<green>► <white>Players in jail: ");
+    public Notice listEmpty = Notice.chat("<red>✘ <dark_red>No players found in jail!");
     @Comment({" ", "# {PLAYER} - Player who has been detained", "# {REMAINING_TIME} - Time of detention",
                   "# {DETAINED_BY} - Player who detained the player"})
-    public Notice jailListPlayerEntry = Notice.chat(
+    public Notice listPlayerEntry = Notice.chat(
         "<green>► <white>{PLAYER} <gray>(<white>{REMAINING_TIME}<gray>) <white>detained by <green>{DETAINED_BY} <white>!");
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/JailMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/JailMessages.java
index 992213a98..c0a6d0e78 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/JailMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/JailMessages.java
@@ -3,26 +3,26 @@
 import com.eternalcode.multification.notice.Notice;
 
 public interface JailMessages {
-    Notice jailLocationSet();
-    Notice jailLocationRemove();
-    Notice jailLocationNotSet();
-    Notice jailLocationOverride();
+    Notice locationSet();
+    Notice locationRemoved();
+    Notice locationNotSet();
+    Notice locationOverride();
 
-    Notice jailDetainBroadcast();
-    Notice jailDetainPrivate();
-    Notice jailDetainCountdown();
-    Notice jailDetainOverride();
-    Notice jailDetainAdmin();
+    Notice detainBroadcast();
+    Notice detainPrivate();
+    Notice detainCountdown();
+    Notice detainOverride();
+    Notice detainAdmin();
 
-    Notice jailReleaseBroadcast();
-    Notice jailReleasePrivate();
-    Notice jailReleaseAll();
-    Notice jailReleaseNoPlayers();
-    Notice jailIsNotPrisoner();
+    Notice releaseBroadcast();
+    Notice releasePrivate();
+    Notice releaseAll();
+    Notice releaseNoPlayers();
+    Notice isNotPrisoner();
 
-    Notice jailListHeader();
-    Notice jailListEmpty();
-    Notice jailListPlayerEntry();
+    Notice listHeader();
+    Notice listEmpty();
+    Notice listPlayerEntry();
 
-    Notice jailCannotUseCommand();
+    Notice cannotUseCommand();
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/PLJailMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/PLJailMessages.java
index fa2cd2112..c6a8a4642 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/PLJailMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/PLJailMessages.java
@@ -10,38 +10,38 @@
 @Accessors(fluent = true)
 public class PLJailMessages extends OkaeriConfig implements JailMessages {
     @Comment({" ", "# Sekcja odpowiedzialna za ustawianie lokalizacji jail'a"})
-    public Notice jailLocationSet = Notice.chat("<green>► <white>Ustawiono lokalizację jail'a!");
-    public Notice jailLocationRemove = Notice.chat("<red>✘ <dark_red>Usunięto lokalizację jail'a!");
-    public Notice jailLocationNotSet = Notice.chat("<red>✘ <dark_red>Lokalizacja jail'a nie została ustawiona!");
-    public Notice jailLocationOverride = Notice.chat("<green>► <white>Nadpisałeś lokalizację jail'a!");
+    public Notice locationSet = Notice.chat("<green>► <white>Ustawiono lokalizację jail'a!");
+    public Notice locationRemoved = Notice.chat("<red>✘ <dark_red>Usunięto lokalizację jail'a!");
+    public Notice locationNotSet = Notice.chat("<red>✘ <dark_red>Lokalizacja jail'a nie została ustawiona!");
+    public Notice locationOverride = Notice.chat("<green>► <white>Nadpisałeś lokalizację jail'a!");
 
     @Comment({" ", "# Sekcja odpowiedzialna za wiadomości dotyczące uwięzienia gracza"})
-    public Notice jailDetainPrivate = Notice.chat("<green>► <white>Zostałeś uwięziony!");
-    public Notice jailCannotUseCommand = Notice.chat("<red>✘ <dark_red>Nie możesz użyć tej komendy!");
+    public Notice detainPrivate = Notice.chat("<green>► <white>Zostałeś uwięziony!");
+    public Notice cannotUseCommand = Notice.chat("<red>✘ <dark_red>Nie możesz użyć tej komendy!");
     @Comment({" ", "# {PLAYER} - Gracz który został uwięziony"})
-    public Notice jailDetainBroadcast = Notice.chat("<green>► <white>Gracz <green>{PLAYER} <white>został uwięziony!");
+    public Notice detainBroadcast = Notice.chat("<green>► <white>Gracz <green>{PLAYER} <white>został uwięziony!");
     @Comment({" ", "# {PLAYER} - Gracz który został uwięziony"})
-    public Notice jailDetainOverride =
+    public Notice detainOverride =
         Notice.chat("<green>► <white>Napisałeś nadaną karę graczowi <green>{PLAYER}<white>!");
     @Comment({" ", "# {REMAINING_TIME} - Pozostały czas do uwolnienia"})
-    public Notice jailDetainCountdown = Notice.actionbar("<red>Pozostało <green>{REMAINING_TIME} <red>do uwolnienia!");
+    public Notice detainCountdown = Notice.actionbar("<red>Pozostało <green>{REMAINING_TIME} <red>do uwolnienia!");
     @Comment({" ", "# {PLAYER} - Administrator którego nie możesz uwięzić"})
-    public Notice jailDetainAdmin = Notice.chat("<red>✘ <dark_red>Nie możesz uwięzić administratora <red>{PLAYER}!");
+    public Notice detainAdmin = Notice.chat("<red>✘ <dark_red>Nie możesz uwięzić administratora <red>{PLAYER}!");
 
     @Comment({" ", "# Sekcja odpowiedzialna za wiadomości dotyczące uwolnienia gracza"})
     @Comment({" ", "# {PLAYER} - Gracz który został uwolniony"})
-    public Notice jailReleaseBroadcast = Notice.chat("<green>► <white>Gracz <green>{PLAYER} <white>został uwolniony!");
-    public Notice jailReleasePrivate = Notice.actionbar("<green>► <white>Zostałeś uwolniony!");
-    public Notice jailReleaseAll = Notice.chat("<green>► <white>Wszyscy gracze zostali uwolnieni!");
-    public Notice jailReleaseNoPlayers = Notice.chat("<red>✘ <dark_red>Nikt nie jest uwięziony!");
+    public Notice releaseBroadcast = Notice.chat("<green>► <white>Gracz <green>{PLAYER} <white>został uwolniony!");
+    public Notice releasePrivate = Notice.actionbar("<green>► <white>Zostałeś uwolniony!");
+    public Notice releaseAll = Notice.chat("<green>► <white>Wszyscy gracze zostali uwolnieni!");
+    public Notice releaseNoPlayers = Notice.chat("<red>✘ <dark_red>Nikt nie jest uwięziony!");
     @Comment({" ", "# {PLAYER} - Nazwa gracza"})
-    public Notice jailIsNotPrisoner = Notice.chat("<red>✘ <dark_red>Gracz {PLAYER} nie jest uwięziony!");
+    public Notice isNotPrisoner = Notice.chat("<red>✘ <dark_red>Gracz {PLAYER} nie jest uwięziony!");
 
     @Comment({" ", "# Sekcja odpowiedzialna za wiadomości dotyczące listy graczy w jail'u"})
-    public Notice jailListHeader = Notice.chat("<green>► <white>Lista graczy w jail'u:");
-    public Notice jailListEmpty = Notice.chat("<red>✘ <dark_red>Nikt nie jest uwięziony!");
+    public Notice listHeader = Notice.chat("<green>► <white>Lista graczy w jail'u:");
+    public Notice listEmpty = Notice.chat("<red>✘ <dark_red>Nikt nie jest uwięziony!");
     @Comment({" ",
                   "# {PLAYER} - Gracz który jest uwięziony, {DETAINED_BY} - Gracz który uwięził gracza, {REMAINING_TIME} - Czas pozostały do uwolnienia"})
-    public Notice jailListPlayerEntry = Notice.chat(
+    public Notice listPlayerEntry = Notice.chat(
         "<green>► <white>Gracz <green>{PLAYER} <white>został uwięziony przez <green>{DETAINED_BY} <white>na czas <green>{REMAINING_TIME} <white>!");
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java
index f4616860e..f32619e95 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java
@@ -232,7 +232,7 @@ interface ItemSection {
     // auto message section
     AutoMessageMessages autoMessage();
     // jail section
-    JailMessages jailSection();
+    JailMessages jail();
     // burn section
     BurnMessages burn();
     // vanish section
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java
index d46c52640..163004929 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java
@@ -5,7 +5,6 @@
 import com.eternalcode.core.feature.container.messages.ENContainerMessages;
 import com.eternalcode.core.feature.repair.messages.ENRepairMessages;
 import com.eternalcode.core.litecommand.argument.messages.ENArgumentMessages;
-import com.eternalcode.core.configuration.contextual.ConfigItem;
 import com.eternalcode.core.feature.adminchat.messages.ENAdminChatMessages;
 import com.eternalcode.core.feature.afk.messages.ENAfkMessages;
 import com.eternalcode.core.feature.automessage.messages.ENAutoMessageMessages;
@@ -525,7 +524,7 @@ public static class ENItemSection extends OkaeriConfig implements ItemSection {
     public ENAutoMessageMessages autoMessage = new ENAutoMessageMessages();
 
     @Comment({" ", "# This section is responsible for handling jail-related stuff."})
-    public ENJailMessages jailSection = new ENJailMessages();
+    public ENJailMessages jail = new ENJailMessages();
 
     @Comment({" ", "# This section is responsible for elder guardian messages."})
     public ENElderGuardianMessages elderGuardian = new ENElderGuardianMessages();
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java
index e06118b27..a6fb48169 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java
@@ -6,7 +6,6 @@
 import com.eternalcode.core.feature.container.messages.PLContainerMessages;
 import com.eternalcode.core.feature.repair.messages.PLRepairMessages;
 import com.eternalcode.core.litecommand.argument.messages.PLArgumentMessages;
-import com.eternalcode.core.configuration.contextual.ConfigItem;
 import com.eternalcode.core.feature.adminchat.messages.PLAdminChatMessages;
 import com.eternalcode.core.feature.afk.messages.PLAfkMessages;
 import com.eternalcode.core.feature.automessage.messages.PLAutoMessageMessages;
@@ -22,7 +21,6 @@
 import com.eternalcode.core.translation.Language;
 import com.eternalcode.core.feature.motd.messages.PLMotdMessages;
 import com.eternalcode.core.feature.msg.messages.PLMsgMessages;
-import com.eternalcode.core.feature.near.messages.NearMessages;
 import com.eternalcode.core.feature.randomteleport.messages.PLRandomTeleportMessages;
 import com.eternalcode.core.feature.seen.messages.PLSeenMessages;
 import com.eternalcode.core.feature.setslot.messages.PLSetSlotMessages;
@@ -40,7 +38,6 @@
 import eu.okaeri.configs.annotation.Comment;
 import lombok.Getter;
 import lombok.experimental.Accessors;
-import org.bukkit.Material;
 import org.bukkit.event.entity.EntityDamageEvent;
 
 import java.io.File;
@@ -555,7 +552,7 @@ public static class PLItemSection extends OkaeriConfig implements ItemSection {
     public PLAutoMessageMessages autoMessage = new PLAutoMessageMessages();
 
     @Comment({" ", "# Ta sekcja odpowiada za wiadomości dotyczące jail'a"})
-    public PLJailMessages jailSection = new PLJailMessages();
+    public PLJailMessages jail = new PLJailMessages();
 
     @Comment({" ", "# Ta sekcja odpowiada za wiadomości dotyczące Elder Guardian'a"})
     public PLElderGuardianMessages elderGuardian = new PLElderGuardianMessages();

From 656b7bec7d7b712852d3bd27d5dcfc7fbd0832b1 Mon Sep 17 00:00:00 2001
From: Igor Michalski <65646893+igoyek@users.noreply.github.com>
Date: Thu, 21 Aug 2025 13:50:58 +0200
Subject: [PATCH 03/11] Refactor jail release logic and update config comments

Refactored JailServiceImpl.releaseAllPlayers to avoid clearing all jailed players and prisoners at once, now only releasing non-cancelled events and handling null players. Updated JailConfig comments for clarity and registered new migration for jail section in Migrations.

Took 8 minutes
---
 .../configuration/migrations/Migrations.java  |  1 +
 .../core/feature/jail/JailConfig.java         |  2 +-
 .../core/feature/jail/JailServiceImpl.java    | 22 ++++++++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
index fcc34b2b6..2c194b855 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
@@ -12,6 +12,7 @@ public class Migrations {
         new Migration_0007_Move_clear_to_dedicated_section(),
         new Migration_0008_Move_repair_to_dedicated_section(),
         new Migration_0009_Rename_allowed_to_restricted_jail_commands(),
+        new Migration_0010_Move_jail_to_dedicated_section()
     };
 
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailConfig.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailConfig.java
index 4fac04d56..6ea08e2db 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailConfig.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailConfig.java
@@ -17,6 +17,6 @@ public class JailConfig extends OkaeriConfig implements JailSettings {
     @Comment("# Command restriction type, either WHITELIST or BLACKLIST")
     public JailCommandRestrictionType restrictionType = JailCommandRestrictionType.WHITELIST;
 
-    @Comment("# Restricted commands for jailed players")
+    @Comment("# List of commands for restriction logic. Acts as a whitelist or blacklist depending on restrictionType.")
     public Set<String> restrictedCommands = Set.of("help", "msg", "r", "tell", "me", "helpop");
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
index 92fa76351..09273aedb 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
@@ -16,7 +16,9 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 import javax.annotation.Nullable;
 import org.bukkit.Location;
@@ -126,24 +128,32 @@ public boolean releasePlayer(Player player) {
 
     @Override
     public void releaseAllPlayers() {
+        Set<UUID> playersToRelease = new HashSet<>();
+
         this.jailedPlayers.forEach((uuid, jailedPlayer) -> {
             Player player = this.server.getPlayer(uuid);
 
             JailReleaseEvent jailReleaseEvent = new JailReleaseEvent(uuid);
             this.eventCaller.callEvent(jailReleaseEvent);
 
-            if (jailReleaseEvent.isCancelled() || player == null) {
+            if (jailReleaseEvent.isCancelled()) {
                 return;
             }
 
-            Location targetLocation = Optional.ofNullable(jailedPlayer.getLastLocation())
-                .orElseGet(this.spawnService::getSpawnLocation);
+            playersToRelease.add(uuid);
+
+            if (player != null) {
+                Location targetLocation = Optional.ofNullable(jailedPlayer.getLastLocation())
+                    .orElseGet(this.spawnService::getSpawnLocation);
 
-            this.teleportService.teleport(player, targetLocation);
+                this.teleportService.teleport(player, targetLocation);
+            }
         });
 
-        this.jailedPlayers.clear();
-        this.prisonerRepository.deleteAllPrisoners();
+        playersToRelease.forEach(uuid -> {
+            this.jailedPlayers.remove(uuid);
+            this.prisonerRepository.deletePrisoner(uuid);
+        });
     }
 
     @Override

From 5bf5d524ba2203843a3ff839047f40e2151c74c7 Mon Sep 17 00:00:00 2001
From: Igor Michalski <65646893+igoyek@users.noreply.github.com>
Date: Thu, 21 Aug 2025 14:05:34 +0200
Subject: [PATCH 04/11] Need tests

Took 15 minutes
---
 eternalcore-api/build.gradle.kts                  |  1 +
 .../core/feature/jail/JailedPlayer.java           | 12 ++++++------
 .../core/feature/jail/JailServiceImpl.java        | 12 ++++++------
 .../core/feature/jail/PrisonerTable.java          | 15 +++++++--------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/eternalcore-api/build.gradle.kts b/eternalcore-api/build.gradle.kts
index d174dbe4c..7951d15fb 100644
--- a/eternalcore-api/build.gradle.kts
+++ b/eternalcore-api/build.gradle.kts
@@ -6,5 +6,6 @@ plugins {
 
 dependencies {
     compileOnly("org.spigotmc:spigot-api:${Versions.SPIGOT_API}")
+    compileOnly("com.eternalcode:eternalcode-commons-bukkit:${Versions.ETERNALCODE_COMMONS}")
     api("org.jetbrains:annotations:${Versions.JETBRAINS_ANNOTATIONS}")
 }
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
index 83855376b..c3d587ca4 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
@@ -1,6 +1,6 @@
 package com.eternalcode.core.feature.jail;
 
-import org.bukkit.Location;
+import com.eternalcode.commons.bukkit.position.Position;
 import org.jetbrains.annotations.Nullable;
 
 import java.time.Duration;
@@ -14,18 +14,18 @@ public class JailedPlayer {
     private final Duration prisonTime;
     private final String detainedBy;
     @Nullable
-    private final Location lastLocation;
+    private final Position lastPosition;
 
     public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String detainedBy) {
         this(player, detainedAt, prisonTime, detainedBy, null);
     }
 
-    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String detainedBy, @Nullable Location lastLocation) {
+    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String detainedBy, @Nullable Position lastPosition) {
         this.player = player;
         this.detainedAt = detainedAt;
         this.prisonTime = prisonTime;
         this.detainedBy = detainedBy;
-        this.lastLocation = lastLocation;
+        this.lastPosition = lastPosition;
     }
     
     public UUID getPlayerUniqueId() {
@@ -45,8 +45,8 @@ public Duration getPrisonTime() {
     }
 
     @Nullable
-    public Location getLastLocation() {
-        return this.lastLocation;
+    public Position getLastPosition() {
+        return this.lastPosition;
     }
 
     public boolean isPrisonExpired() {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
index 09273aedb..30d3ab08f 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
@@ -86,7 +86,7 @@ public boolean detainPlayer(Player player, CommandSender detainedBy, @Nullable D
             return false;
         }
 
-        Location lastLocation = player.getLocation();
+        Position lastLocation = PositionAdapter.convert(player.getLocation());
 
         JailedPlayer jailedPlayer = new JailedPlayer(
             player.getUniqueId(),
@@ -117,8 +117,8 @@ public boolean releasePlayer(Player player) {
         this.prisonerRepository.deletePrisoner(player.getUniqueId());
         this.jailedPlayers.remove(player.getUniqueId());
 
-        if (jailedPlayer != null && jailedPlayer.getLastLocation() != null) {
-            this.teleportService.teleport(player, jailedPlayer.getLastLocation());
+        if (jailedPlayer != null && jailedPlayer.getLastPosition() != null) {
+            this.teleportService.teleport(player, PositionAdapter.convert(jailedPlayer.getLastPosition()));
         } else {
             this.spawnService.teleportToSpawn(player);
         }
@@ -143,10 +143,10 @@ public void releaseAllPlayers() {
             playersToRelease.add(uuid);
 
             if (player != null) {
-                Location targetLocation = Optional.ofNullable(jailedPlayer.getLastLocation())
-                    .orElseGet(this.spawnService::getSpawnLocation);
+                Position targetPosition = Optional.ofNullable(jailedPlayer.getLastPosition())
+                    .orElse(PositionAdapter.convert(this.spawnService.getSpawnLocation()));
 
-                this.teleportService.teleport(player, targetLocation);
+                this.teleportService.teleport(player, PositionAdapter.convert(targetPosition));
             }
         });
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
index 72dc14491..27ca6a24a 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
@@ -1,10 +1,9 @@
 package com.eternalcode.core.feature.jail;
 
-import com.eternalcode.core.database.persister.LocationPersister;
+import com.eternalcode.commons.bukkit.position.Position;
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import org.bukkit.Location;
 import org.jetbrains.annotations.Nullable;
 
 import java.time.Duration;
@@ -27,9 +26,9 @@ class PrisonerTable {
     @DatabaseField(columnName = "detained_by")
     private String detainedBy;
 
-    @DatabaseField(columnName = "last_location", persisterClass = LocationPersister.class)
+    @DatabaseField(columnName = "last_position", dataType =  DataType.SERIALIZABLE)
     @Nullable
-    private Location lastLocation;
+    private Position lastPosition;
 
     PrisonerTable() {
     }
@@ -38,16 +37,16 @@ class PrisonerTable {
         this(uuid, detainedAt, duration, detainedBy, null);
     }
 
-    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy, @Nullable Location lastLocation) {
+    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy, @Nullable Position lastPosition) {
         this.uuid = uuid;
         this.detainedAt = detainedAt;
         this.duration = duration;
         this.detainedBy = detainedBy;
-        this.lastLocation = lastLocation;
+        this.lastPosition = lastPosition;
     }
 
     JailedPlayer toPrisoner() {
-        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy, this.lastLocation);
+        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy, this.lastPosition);
     }
 
     static PrisonerTable from(JailedPlayer jailedPlayer) {
@@ -56,7 +55,7 @@ static PrisonerTable from(JailedPlayer jailedPlayer) {
             jailedPlayer.getDetainedAt(),
             jailedPlayer.getPrisonTime(),
             jailedPlayer.getDetainedBy(),
-            jailedPlayer.getLastLocation()
+            jailedPlayer.getLastPosition()
         );
     }
 }

From 526e344628dc283b0abbd739a4cea6647768173d Mon Sep 17 00:00:00 2001
From: Jakubk15 <77227023+Jakubk15@users.noreply.github.com>
Date: Thu, 21 Aug 2025 17:47:09 +0200
Subject: [PATCH 05/11] detainPrivate -> detained releasePrivate -> released

---
 .../Migration_0010_Move_jail_to_dedicated_section.java    | 8 ++++----
 .../com/eternalcode/core/feature/jail/JailCommand.java    | 7 +++----
 .../java/com/eternalcode/core/feature/jail/JailTask.java  | 2 +-
 .../core/feature/jail/messages/ENJailMessages.java        | 4 ++--
 .../core/feature/jail/messages/JailMessages.java          | 4 ++--
 .../core/feature/jail/messages/PLJailMessages.java        | 4 ++--
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Move_jail_to_dedicated_section.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Move_jail_to_dedicated_section.java
index b81fe58e4..4f3a96500 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Move_jail_to_dedicated_section.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Move_jail_to_dedicated_section.java
@@ -1,9 +1,9 @@
 package com.eternalcode.core.configuration.migrations;
 
-import eu.okaeri.configs.migrate.builtin.NamedMigration;
-
 import static eu.okaeri.configs.migrate.ConfigMigrationDsl.move;
 
+import eu.okaeri.configs.migrate.builtin.NamedMigration;
+
 public class Migration_0010_Move_jail_to_dedicated_section extends NamedMigration {
 
     Migration_0010_Move_jail_to_dedicated_section() {
@@ -16,13 +16,13 @@ public class Migration_0010_Move_jail_to_dedicated_section extends NamedMigratio
             move("jailSection.jailLocationOverride", "jail.locationOverride"),
 
             move("jailSection.jailDetainBroadcast", "jail.detainBroadcast"),
-            move("jailSection.jailDetainPrivate", "jail.detainPrivate"),
+            move("jailSection.jailDetainPrivate", "jail.detained"),
             move("jailSection.jailDetainCountdown", "jail.detainCountdown"),
             move("jailSection.jailDetainOverride", "jail.detainOverride"),
             move("jailSection.jailDetainAdmin", "jail.detainAdmin"),
 
             move("jailSection.jailReleaseBroadcast", "jail.releaseBroadcast"),
-            move("jailSection.jailReleasePrivate", "jail.releasePrivate"),
+            move("jailSection.jailReleasePrivate", "jail.released"),
             move("jailSection.jailReleaseAll", "jail.releaseAll"),
             move("jailSection.jailReleaseNoPlayers", "jail.releaseNoPlayers"),
             move("jailSection.jailIsNotPrisoner", "jail.isNotPrisoner"),
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java
index 1fc8b92b8..3fab2a237 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java
@@ -16,12 +16,11 @@
 import dev.rollczi.litecommands.annotations.context.Context;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
+import java.time.Duration;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-import java.time.Duration;
-
 @Command(name = "jail")
 @Permission(JAIL_BYPASS_PERMISSION)
 class JailCommand {
@@ -142,7 +141,7 @@ void executeJailDetainForTime(@Context Player player, @Arg Player target, @Arg D
             .send();
 
         this.noticeService.create()
-            .notice(translation -> translation.jail().detainPrivate())
+            .notice(translation -> translation.jail().detained())
             .player(target.getUniqueId())
             .send();
     }
@@ -170,7 +169,7 @@ void executeJailRelease(@Context Player player, @Arg Player target) {
         this.jailService.releasePlayer(target);
 
         this.noticeService.create()
-            .notice(translation -> translation.jail().releasePrivate())
+            .notice(translation -> translation.jail().released())
             .player(target.getUniqueId())
             .send();
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailTask.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailTask.java
index bfba8d398..ee49fb336 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailTask.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailTask.java
@@ -39,7 +39,7 @@ public void run() {
 
             if (jailedPlayer.isPrisonExpired()) {
                 this.noticeService.create()
-                    .notice(translation -> translation.jail().releasePrivate())
+                    .notice(translation -> translation.jail().released())
                     .player(jailedPlayer.getPlayerUniqueId())
                     .send();
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java
index ba9addd09..77987ca3f 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java
@@ -16,7 +16,7 @@ public class ENJailMessages extends OkaeriConfig implements JailMessages {
     public Notice locationOverride = Notice.chat("<green>► <white>Jail location has been overridden!");
 
     @Comment({" ", "# Section responsible for detaining players"})
-    public Notice detainPrivate = Notice.chat("<green>► <white>You have been jailed!");
+    public Notice detained = Notice.chat("<green>► <white>You have been jailed!");
     public Notice cannotUseCommand = Notice.chat("<red>✘ <dark_red>You can't use this command! You are in jail!");
     @Comment({" ", "# {PLAYER} - Player who has been detained"})
     public Notice detainOverride =
@@ -34,7 +34,7 @@ public class ENJailMessages extends OkaeriConfig implements JailMessages {
     @Comment({" ", "# {PLAYER} - Player who has been released from jail"})
     public Notice releaseBroadcast =
         Notice.chat("<green>► <white>Player <green>{PLAYER} <white>has been granted freedom!");
-    public Notice releasePrivate = Notice.actionbar("<green> You have been released from jail!");
+    public Notice released = Notice.actionbar("<green> You have been released from jail!");
     public Notice releaseAll = Notice.chat("<green>► <white>All players have been released from jail!");
     public Notice releaseNoPlayers = Notice.chat("<red>✘ <dark_red>No players found in jail!");
     @Comment({" ", "# {PLAYER} - Player nickname"})
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/JailMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/JailMessages.java
index c0a6d0e78..22f715d9a 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/JailMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/JailMessages.java
@@ -9,13 +9,13 @@ public interface JailMessages {
     Notice locationOverride();
 
     Notice detainBroadcast();
-    Notice detainPrivate();
+    Notice detained();
     Notice detainCountdown();
     Notice detainOverride();
     Notice detainAdmin();
 
     Notice releaseBroadcast();
-    Notice releasePrivate();
+    Notice released();
     Notice releaseAll();
     Notice releaseNoPlayers();
     Notice isNotPrisoner();
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/PLJailMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/PLJailMessages.java
index c6a8a4642..8f66a4209 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/PLJailMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/PLJailMessages.java
@@ -16,7 +16,7 @@ public class PLJailMessages extends OkaeriConfig implements JailMessages {
     public Notice locationOverride = Notice.chat("<green>► <white>Nadpisałeś lokalizację jail'a!");
 
     @Comment({" ", "# Sekcja odpowiedzialna za wiadomości dotyczące uwięzienia gracza"})
-    public Notice detainPrivate = Notice.chat("<green>► <white>Zostałeś uwięziony!");
+    public Notice detained = Notice.chat("<green>► <white>Zostałeś uwięziony!");
     public Notice cannotUseCommand = Notice.chat("<red>✘ <dark_red>Nie możesz użyć tej komendy!");
     @Comment({" ", "# {PLAYER} - Gracz który został uwięziony"})
     public Notice detainBroadcast = Notice.chat("<green>► <white>Gracz <green>{PLAYER} <white>został uwięziony!");
@@ -31,7 +31,7 @@ public class PLJailMessages extends OkaeriConfig implements JailMessages {
     @Comment({" ", "# Sekcja odpowiedzialna za wiadomości dotyczące uwolnienia gracza"})
     @Comment({" ", "# {PLAYER} - Gracz który został uwolniony"})
     public Notice releaseBroadcast = Notice.chat("<green>► <white>Gracz <green>{PLAYER} <white>został uwolniony!");
-    public Notice releasePrivate = Notice.actionbar("<green>► <white>Zostałeś uwolniony!");
+    public Notice released = Notice.actionbar("<green>► <white>Zostałeś uwolniony!");
     public Notice releaseAll = Notice.chat("<green>► <white>Wszyscy gracze zostali uwolnieni!");
     public Notice releaseNoPlayers = Notice.chat("<red>✘ <dark_red>Nikt nie jest uwięziony!");
     @Comment({" ", "# {PLAYER} - Nazwa gracza"})

From 67c073526f0c3053b1c052f25cf6c4fc20274bfc Mon Sep 17 00:00:00 2001
From: Igor Michalski <65646893+igoyek@users.noreply.github.com>
Date: Thu, 21 Aug 2025 22:51:05 +0200
Subject: [PATCH 06/11] Refactor jail feature to use Bukkit Location

Replaced custom Position class with Bukkit's Location for storing and handling player locations in jail-related classes. Updated constructors, field names, and database persister to reflect this change, improving compatibility and simplifying location management.

Took 36 minutes
---
 .../core/feature/jail/JailedPlayer.java       | 19 ++++++-----------
 .../core/feature/jail/JailCommand.java        | 18 +++++++++-------
 .../feature/jail/JailPermissionConstant.java  | 17 ++++++++++-----
 .../core/feature/jail/JailServiceImpl.java    | 13 ++++++------
 .../core/feature/jail/PrisonerTable.java      | 21 +++++++------------
 5 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
index c3d587ca4..7aa66ef87 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
@@ -1,7 +1,6 @@
 package com.eternalcode.core.feature.jail;
 
-import com.eternalcode.commons.bukkit.position.Position;
-import org.jetbrains.annotations.Nullable;
+import org.bukkit.Location;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -13,19 +12,14 @@ public class JailedPlayer {
     private final Instant detainedAt;
     private final Duration prisonTime;
     private final String detainedBy;
-    @Nullable
-    private final Position lastPosition;
+    private final Location lastLocation;
 
-    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String detainedBy) {
-        this(player, detainedAt, prisonTime, detainedBy, null);
-    }
-
-    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String detainedBy, @Nullable Position lastPosition) {
+    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String detainedBy, Location lastLocation) {
         this.player = player;
         this.detainedAt = detainedAt;
         this.prisonTime = prisonTime;
         this.detainedBy = detainedBy;
-        this.lastPosition = lastPosition;
+        this.lastLocation = lastLocation;
     }
     
     public UUID getPlayerUniqueId() {
@@ -44,9 +38,8 @@ public Duration getPrisonTime() {
         return this.prisonTime;
     }
 
-    @Nullable
-    public Position getLastPosition() {
-        return this.lastPosition;
+    public Location getLastLocation() {
+        return this.lastLocation;
     }
 
     public boolean isPrisonExpired() {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java
index 3fab2a237..87069f1af 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java
@@ -1,11 +1,5 @@
 package com.eternalcode.core.feature.jail;
 
-import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_BYPASS_PERMISSION;
-import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_DETAIN_PERMISSION;
-import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_LIST_PERMISSION;
-import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_RELEASE_PERMISSION;
-import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_SETUP_PERMISSION;
-
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
@@ -16,13 +10,21 @@
 import dev.rollczi.litecommands.annotations.context.Context;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import java.time.Duration;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+import java.time.Duration;
+
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_BYPASS_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_COMMAND_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_DETAIN_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_LIST_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_RELEASE_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_SETUP_PERMISSION;
+
 @Command(name = "jail")
-@Permission(JAIL_BYPASS_PERMISSION)
+@Permission(JAIL_COMMAND_PERMISSION)
 class JailCommand {
 
     private final JailService jailService;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailPermissionConstant.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailPermissionConstant.java
index db586e911..807785469 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailPermissionConstant.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailPermissionConstant.java
@@ -4,37 +4,44 @@
 
 public class JailPermissionConstant {
 
+    @PermissionDocs(
+        name = "Jail Command",
+        permission = JailPermissionConstant .JAIL_COMMAND_PERMISSION,
+        description = "Permission allows to use jail commands."
+    )
+    public static final String JAIL_COMMAND_PERMISSION = "eternalcore.jail";
+
     @PermissionDocs(
         name = "Jail Bypass",
-        permission = JAIL_BYPASS_PERMISSION,
+        permission = JailPermissionConstant.JAIL_BYPASS_PERMISSION,
         description = "Permission allows to bypass jail punishment."
     )
     public static final String JAIL_BYPASS_PERMISSION = "eternalcore.jail.bypass";
 
     @PermissionDocs(
         name = "Jail Detain",
-        permission = JAIL_DETAIN_PERMISSION,
+        permission = JailPermissionConstant.JAIL_DETAIN_PERMISSION,
         description = "Allows to detain players in jail."
     )
     public static final String JAIL_DETAIN_PERMISSION = "eternalcore.jail.detain";
 
     @PermissionDocs(
         name = "Jail Release",
-        permission = JAIL_RELEASE_PERMISSION,
+        permission = JailPermissionConstant.JAIL_RELEASE_PERMISSION,
         description = "Allows to release players from jail."
     )
     public static final String JAIL_RELEASE_PERMISSION = "eternalcore.jail.release";
 
     @PermissionDocs(
         name = "Jail List",
-        permission = JAIL_LIST_PERMISSION,
+        permission = JailPermissionConstant.JAIL_LIST_PERMISSION,
         description = "Allows to list all jailed players."
     )
     public static final String JAIL_LIST_PERMISSION = "eternalcore.jail.list";
 
     @PermissionDocs(
         name = "Jail Setup",
-        permission = JAIL_SETUP_PERMISSION,
+        permission = JailPermissionConstant.JAIL_SETUP_PERMISSION,
         description = "Permission allows to setup jail area."
     )
     public static final String JAIL_SETUP_PERMISSION = "eternalcore.jail.setup";
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
index 30d3ab08f..c042fe214 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
@@ -86,7 +86,7 @@ public boolean detainPlayer(Player player, CommandSender detainedBy, @Nullable D
             return false;
         }
 
-        Position lastLocation = PositionAdapter.convert(player.getLocation());
+        Location lastLocation = player.getLocation();
 
         JailedPlayer jailedPlayer = new JailedPlayer(
             player.getUniqueId(),
@@ -117,8 +117,8 @@ public boolean releasePlayer(Player player) {
         this.prisonerRepository.deletePrisoner(player.getUniqueId());
         this.jailedPlayers.remove(player.getUniqueId());
 
-        if (jailedPlayer != null && jailedPlayer.getLastPosition() != null) {
-            this.teleportService.teleport(player, PositionAdapter.convert(jailedPlayer.getLastPosition()));
+        if (jailedPlayer != null && jailedPlayer.getLastLocation() != null) {
+            this.teleportService.teleport(player, jailedPlayer.getLastLocation());
         } else {
             this.spawnService.teleportToSpawn(player);
         }
@@ -143,10 +143,9 @@ public void releaseAllPlayers() {
             playersToRelease.add(uuid);
 
             if (player != null) {
-                Position targetPosition = Optional.ofNullable(jailedPlayer.getLastPosition())
-                    .orElse(PositionAdapter.convert(this.spawnService.getSpawnLocation()));
-
-                this.teleportService.teleport(player, PositionAdapter.convert(targetPosition));
+                this.teleportService.teleport(player, jailedPlayer.getLastLocation() != null
+                    ? jailedPlayer.getLastLocation()
+                    : this.spawnService.getSpawnLocation());
             }
         });
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
index 27ca6a24a..9d765f6cb 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
@@ -1,10 +1,10 @@
 package com.eternalcode.core.feature.jail;
 
-import com.eternalcode.commons.bukkit.position.Position;
+import com.eternalcode.core.database.persister.LocationPersister;
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import org.jetbrains.annotations.Nullable;
+import org.bukkit.Location;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -26,27 +26,22 @@ class PrisonerTable {
     @DatabaseField(columnName = "detained_by")
     private String detainedBy;
 
-    @DatabaseField(columnName = "last_position", dataType =  DataType.SERIALIZABLE)
-    @Nullable
-    private Position lastPosition;
+    @DatabaseField(columnName = "last_location", persisterClass = LocationPersister.class)
+    private Location lastLocation;
 
     PrisonerTable() {
     }
 
-    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy) {
-        this(uuid, detainedAt, duration, detainedBy, null);
-    }
-
-    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy, @Nullable Position lastPosition) {
+    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy, Location lastLocation) {
         this.uuid = uuid;
         this.detainedAt = detainedAt;
         this.duration = duration;
         this.detainedBy = detainedBy;
-        this.lastPosition = lastPosition;
+        this.lastLocation = lastLocation;
     }
 
     JailedPlayer toPrisoner() {
-        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy, this.lastPosition);
+        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy, this.lastLocation);
     }
 
     static PrisonerTable from(JailedPlayer jailedPlayer) {
@@ -55,7 +50,7 @@ static PrisonerTable from(JailedPlayer jailedPlayer) {
             jailedPlayer.getDetainedAt(),
             jailedPlayer.getPrisonTime(),
             jailedPlayer.getDetainedBy(),
-            jailedPlayer.getLastPosition()
+            jailedPlayer.getLastLocation()
         );
     }
 }

From ef0a5cb9b9182c82256a7b7751a663bb739eb62d Mon Sep 17 00:00:00 2001
From: Igor Michalski <65646893+igoyek@users.noreply.github.com>
Date: Fri, 22 Aug 2025 14:05:28 +0200
Subject: [PATCH 07/11] Location -> Position refactor

Took 58 minutes
---
 .../example/feature/home/ApiHomeCommand.java  |  2 +-
 .../example/feature/home/ApiHomeListener.java |  6 +-
 .../eternalcode/core/feature/home/Home.java   |  5 +-
 .../core/feature/home/HomeService.java        |  4 +-
 .../feature/home/event/HomeCreateEvent.java   | 17 +++--
 .../feature/home/event/HomeOverrideEvent.java | 17 ++---
 .../home/event/PreHomeTeleportEvent.java      | 13 ++--
 .../core/feature/jail/JailedPlayer.java       | 11 ++--
 .../database/persister/PositionPersister.java | 66 +++++++++++++++++++
 .../core/feature/home/HomeImpl.java           | 17 ++---
 .../core/feature/home/HomeManager.java        | 11 ++--
 .../feature/home/HomePlaceholderSetup.java    |  2 +-
 .../feature/home/HomeTeleportService.java     |  6 +-
 .../feature/home/command/SetHomeCommand.java  |  5 +-
 .../core/feature/home/database/HomeTable.java | 16 ++---
 .../home/homeadmin/HomeAdminCommand.java      | 17 +++--
 .../core/feature/jail/JailServiceImpl.java    | 12 ++--
 .../core/feature/jail/PrisonerTable.java      | 20 +++---
 .../core/litecommand/LiteCommandsSetup.java   |  2 +-
 .../argument/GameModeArgument.java            |  1 -
 .../argument/PositionArgument.java            | 55 ++++++++++++++++
 .../argument/messages/ArgumentMessages.java   |  1 +
 .../argument/messages/ENArgumentMessages.java |  1 +
 .../argument/messages/PLArgumentMessages.java |  2 +-
 24 files changed, 225 insertions(+), 84 deletions(-)
 create mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/database/persister/PositionPersister.java
 create mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/PositionArgument.java

diff --git a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeCommand.java b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeCommand.java
index cd87e28ee..662033d8a 100644
--- a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeCommand.java
+++ b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeCommand.java
@@ -26,7 +26,7 @@ void executeSet(@Context Player player, @Arg("homeName") String homeName) {
     @Execute(name = "teleport")
     void executeTeleport(@Context Player player, @Arg("homeName") String homeName) {
         Location location = this.homeService.getHome(player.getUniqueId(), homeName)
-            .map(home -> home.getLocation())
+            .map(home -> home.getPosition())
             .orElse(null);
 
         if (location == null) {
diff --git a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeListener.java b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeListener.java
index 880629c5c..0b2905dcb 100644
--- a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeListener.java
+++ b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeListener.java
@@ -27,7 +27,7 @@ public ApiHomeListener(Server server) {
 
     @EventHandler
     void onHomeOverride(HomeOverrideEvent event) {
-        Location location = event.getLocation();
+        Location location = event.getPosition();
 
         String name = event.getHomeName();
         int blockX = location.getBlockX();
@@ -39,7 +39,7 @@ void onHomeOverride(HomeOverrideEvent event) {
 
     @EventHandler
     void onHomeCreate(HomeCreateEvent event) {
-        Location location = event.getLocation();
+        Location location = event.getPosition();
 
         String name = event.getHomeName();
         int blockX = location.getBlockX();
@@ -59,7 +59,7 @@ void onHomeCreateTroll(HomeCreateEvent event) {
         }
 
         if (player.hasPotionEffect(PotionEffectType.BAD_OMEN)) {
-            event.setLocation(player.getWorld().getSpawnLocation());
+            event.setPosition(player.getWorld().getSpawnLocation());
             event.setHomeName("bimbimbambam");
             System.out.println("Troll: Home location overridden to world spawn.");
         }
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/Home.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/Home.java
index 8b6b1cd23..a9c1cc9ff 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/Home.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/Home.java
@@ -1,11 +1,12 @@
 package com.eternalcode.core.feature.home;
 
+import com.eternalcode.commons.bukkit.position.Position;
+
 import java.util.UUID;
-import org.bukkit.Location;
 
 public interface Home {
 
-    Location getLocation();
+    Position getPosition();
 
     String getName();
 
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/HomeService.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/HomeService.java
index 911b5b6fa..25f4428d9 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/HomeService.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/HomeService.java
@@ -4,6 +4,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+
+import com.eternalcode.commons.bukkit.position.Position;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
@@ -23,7 +25,7 @@ public interface HomeService {
     void deleteHome(UUID playerUniqueId, String name);
 
     @Nullable
-    Home createHome(UUID playerUniqueId, String name, Location location);
+    Home createHome(UUID playerUniqueId, String name, Position position);
 
     int getHomeLimit(Player player);
 }
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeCreateEvent.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeCreateEvent.java
index b9d2e426f..6bb29b8ef 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeCreateEvent.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeCreateEvent.java
@@ -1,6 +1,8 @@
 package com.eternalcode.core.feature.home.event;
 
 import java.util.UUID;
+
+import com.eternalcode.commons.bukkit.position.Position;
 import org.bukkit.Location;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
@@ -16,15 +18,16 @@ public class HomeCreateEvent extends Event implements Cancellable {
     private final UUID playerUniqueId;
     private final UUID homeUniqueId;
     private String homeName;
-    private Location location;
+    private Position position;
     private boolean cancelled;
 
-    public HomeCreateEvent(UUID playerUniqueId, String homeName, UUID homeUniqueId, Location location) {
+    public HomeCreateEvent(UUID playerUniqueId, String homeName, UUID homeUniqueId, Position position) {
         super(false);
+
         this.playerUniqueId = playerUniqueId;
         this.homeName = homeName;
         this.homeUniqueId = homeUniqueId;
-        this.location = location;
+        this.position = position;
     }
 
     public UUID getHomeUniqueId() {
@@ -43,12 +46,12 @@ public UUID getPlayerUniqueId() {
         return this.playerUniqueId;
     }
 
-    public Location getLocation() {
-        return this.location;
+    public Position getPosition() {
+        return this.position;
     }
 
-    public void setLocation(Location location) {
-        this.location = location;
+    public void setPosition(Position position) {
+        this.position = position;
     }
 
     @Override
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeOverrideEvent.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeOverrideEvent.java
index 8fd427321..6e7220aea 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeOverrideEvent.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeOverrideEvent.java
@@ -1,6 +1,7 @@
 package com.eternalcode.core.feature.home.event;
 
-import com.eternalcode.core.feature.home.Home;
+import com.eternalcode.commons.bukkit.position.Position;
+
 import java.util.UUID;
 import org.bukkit.Location;
 import org.bukkit.event.Cancellable;
@@ -17,16 +18,16 @@ public class HomeOverrideEvent extends Event implements Cancellable {
     private final UUID playerUniqueId;
     private final UUID homeUniqueId;
     private String homeName;
-    private Location location;
+    private Position position;
     private boolean cancelled;
 
-    public HomeOverrideEvent(UUID playerUniqueId, String homeName, UUID homeUniqueId, Location location) {
+    public HomeOverrideEvent(UUID playerUniqueId, String homeName, UUID homeUniqueId, Position position) {
         super(false);
 
         this.playerUniqueId = playerUniqueId;
         this.homeName = homeName;
         this.homeUniqueId = homeUniqueId;
-        this.location = location;
+        this.position = position;
     }
 
     public String getHomeName() {
@@ -45,12 +46,12 @@ public UUID getPlayerUniqueId() {
         return this.playerUniqueId;
     }
 
-    public void setLocation(Location location) {
-        this.location = location;
+    public void setPosition(Position position) {
+        this.position = position;
     }
 
-    public Location getLocation() {
-        return this.location;
+    public Position getPosition() {
+        return this.position;
     }
 
     @Override
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/PreHomeTeleportEvent.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/PreHomeTeleportEvent.java
index b0ecc3d08..70bd3c37c 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/PreHomeTeleportEvent.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/PreHomeTeleportEvent.java
@@ -1,5 +1,6 @@
 package com.eternalcode.core.feature.home.event;
 
+import com.eternalcode.commons.bukkit.position.Position;
 import com.eternalcode.core.feature.home.Home;
 import java.util.UUID;
 import org.bukkit.Location;
@@ -16,7 +17,7 @@ public class PreHomeTeleportEvent extends Event implements Cancellable {
 
     private final UUID playerUniqueId;
     private final Home home;
-    private Location location;
+    private Position position;
     private boolean cancelled;
 
     public PreHomeTeleportEvent(UUID playerUniqueId, Home home) {
@@ -24,19 +25,19 @@ public PreHomeTeleportEvent(UUID playerUniqueId, Home home) {
 
         this.playerUniqueId = playerUniqueId;
         this.home = home;
-        this.location = home.getLocation();
+        this.position = home.getPosition();
     }
 
     public Home getHome() {
         return this.home;
     }
 
-    public Location getLocation() {
-        return this.location;
+    public Position getPosition() {
+        return this.position;
     }
 
-    public void setLocation(Location location) {
-        this.location = location;
+    public void setPosition(Position position) {
+        this.position = position;
     }
 
 
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
index 7aa66ef87..889996b5f 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
@@ -1,5 +1,6 @@
 package com.eternalcode.core.feature.jail;
 
+import com.eternalcode.commons.bukkit.position.Position;
 import org.bukkit.Location;
 
 import java.time.Duration;
@@ -12,14 +13,14 @@ public class JailedPlayer {
     private final Instant detainedAt;
     private final Duration prisonTime;
     private final String detainedBy;
-    private final Location lastLocation;
+    private final Position lastPosition;
 
-    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String detainedBy, Location lastLocation) {
+    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String detainedBy, Position lastPosition) {
         this.player = player;
         this.detainedAt = detainedAt;
         this.prisonTime = prisonTime;
         this.detainedBy = detainedBy;
-        this.lastLocation = lastLocation;
+        this.lastPosition = lastPosition;
     }
     
     public UUID getPlayerUniqueId() {
@@ -38,8 +39,8 @@ public Duration getPrisonTime() {
         return this.prisonTime;
     }
 
-    public Location getLastLocation() {
-        return this.lastLocation;
+    public Position getLastPosition() {
+        return this.lastPosition;
     }
 
     public boolean isPrisonExpired() {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/PositionPersister.java b/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/PositionPersister.java
new file mode 100644
index 000000000..e103a3d01
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/PositionPersister.java
@@ -0,0 +1,66 @@
+package com.eternalcode.core.database.persister;
+
+import com.eternalcode.commons.bukkit.position.Position;
+import com.j256.ormlite.field.FieldType;
+import com.j256.ormlite.field.SqlType;
+import com.j256.ormlite.field.types.BaseDataType;
+import com.j256.ormlite.support.DatabaseResults;
+
+import java.sql.SQLException;
+
+public class PositionPersister extends BaseDataType {
+
+    private static final PositionPersister instance = new PositionPersister();
+
+    private PositionPersister() {
+        super(SqlType.LONG_STRING, new Class<?>[] {Position.class});
+    }
+
+    @Override
+    public Object javaToSqlArg(FieldType fieldType, Object javaObject) {
+        if (javaObject == null) {
+            return null;
+        }
+
+        Position position = (Position) javaObject;
+        return position.world() + "/" + position.x() + "/" + position.y() + "/" + position.z() + "/" + position.yaw() + "/" + position.pitch();
+    }
+
+    @Override
+    public Object resultToSqlArg(FieldType fieldType, DatabaseResults results, int columnPos) throws SQLException {
+        return results.getString(columnPos);
+    }
+
+    @Override
+    public Object parseDefaultString(FieldType fieldType, String defaultStr) {
+        return String.valueOf(defaultStr);
+    }
+
+    @Override
+    public Object sqlArgToJava(FieldType fieldType, Object sqlArg, int columnPos) {
+        String s = (String) sqlArg;
+
+        if (s == null) {
+            return null;
+        }
+
+        String[] params = s.split("/");
+
+        if (params.length != 6) {
+            throw new IllegalArgumentException("Invalid position format: " + s);
+        }
+
+        return new Position(
+            Double.parseDouble(params[1]),
+            Double.parseDouble(params[2]),
+            Double.parseDouble(params[3]),
+            Float.parseFloat(params[4]),
+            Float.parseFloat(params[5]),
+            params[0]
+        );
+    }
+
+    public static PositionPersister getSingleton() {
+        return instance;
+    }
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeImpl.java
index 4d46f93bb..c17eac5cc 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeImpl.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeImpl.java
@@ -2,27 +2,28 @@
 
 import java.util.Objects;
 import java.util.UUID;
-import org.bukkit.Location;
+
+import com.eternalcode.commons.bukkit.position.Position;
 
 public class HomeImpl implements Home {
 
     private final UUID uuid;
     private final UUID owner;
     private final String name;
-    private final Location location;
+    private final Position position;
 
-    public HomeImpl(UUID uuid, UUID owner, String name, Location location) {
+    public HomeImpl(UUID uuid, UUID owner, String name, Position position) {
         this.uuid = uuid;
         this.owner = owner;
         this.name = name;
-        this.location = location;
+        this.position = position;
     }
 
-    public HomeImpl(UUID owner, String name, Location location) {
+    public HomeImpl(UUID owner, String name, Position position) {
         this.owner = owner;
         this.uuid = UUID.randomUUID();
         this.name = name;
-        this.location = location;
+        this.position = position;
     }
 
     @Override
@@ -41,8 +42,8 @@ public String getName() {
     }
 
     @Override
-    public Location getLocation() {
-        return this.location;
+    public Position getPosition() {
+        return this.position;
     }
 
     @Override
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeManager.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeManager.java
index 2909214dd..c033f2a88 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeManager.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeManager.java
@@ -1,5 +1,6 @@
 package com.eternalcode.core.feature.home;
 
+import com.eternalcode.commons.bukkit.position.Position;
 import com.eternalcode.core.event.EventCaller;
 import com.eternalcode.core.feature.home.database.HomeRepository;
 import com.eternalcode.core.feature.home.event.HomeCreateEvent;
@@ -46,33 +47,33 @@ private HomeManager(
     }
 
     @Override
-    public Home createHome(UUID playerUniqueId, String name, Location location) {
+    public Home createHome(UUID playerUniqueId, String name, Position position) {
         Map<String, Home> homes = this.userHomes.computeIfAbsent(playerUniqueId, k -> new HashMap<>());
 
         Home home = homes.get(name);
 
         if (home != null) {
-            HomeOverrideEvent event = this.eventCaller.callEvent(new HomeOverrideEvent(playerUniqueId, name, playerUniqueId, location));
+            HomeOverrideEvent event = this.eventCaller.callEvent(new HomeOverrideEvent(playerUniqueId, name, playerUniqueId, position));
 
             if (event.isCancelled()) {
                 return home;
             }
 
-            Home homeInEvent = new HomeImpl(playerUniqueId, event.getHomeName(), event.getLocation());
+            Home homeInEvent = new HomeImpl(playerUniqueId, event.getHomeName(), event.getPosition());
             homes.put(event.getHomeName(), homeInEvent);
             this.repository.deleteHome(playerUniqueId, name).thenAccept(completable -> this.repository.saveHome(homeInEvent));
 
             return homeInEvent;
         }
 
-        HomeCreateEvent event = new HomeCreateEvent(playerUniqueId, name, playerUniqueId, location);
+        HomeCreateEvent event = new HomeCreateEvent(playerUniqueId, name, playerUniqueId, position);
         this.eventCaller.callEvent(event);
 
         if (event.isCancelled()) {
             return null;
         }
 
-        Home homeInEvent = new HomeImpl(playerUniqueId, event.getHomeName(), event.getLocation());
+        Home homeInEvent = new HomeImpl(playerUniqueId, event.getHomeName(), event.getPosition());
         homes.put(event.getHomeName(), homeInEvent);
         this.repository.saveHome(homeInEvent);
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomePlaceholderSetup.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomePlaceholderSetup.java
index f4d695763..46e0963f5 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomePlaceholderSetup.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomePlaceholderSetup.java
@@ -32,7 +32,7 @@ void setUp(PlaceholderRegistry placeholderRegistry) {
             PlaceholderReplacer.of("homes_count", (text, targetPlayer) -> this.homesCount(targetPlayer)),
             PlaceholderReplacer.of("homes_limit", (text, targetPlayer) -> this.homesLimit(targetPlayer)),
             PlaceholderReplacer.of("homes_left", (text, targetPlayer) -> this.homesLeft(targetPlayer))
-        ).forEach(placeholder -> placeholderRegistry.registerPlaceholder(placeholder));
+        ).forEach(placeholderRegistry::registerPlaceholder);
     }
 
     private String homesLeft(Player targetPlayer) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeTeleportService.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeTeleportService.java
index d8aed23b6..70d1b780c 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeTeleportService.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeTeleportService.java
@@ -52,13 +52,13 @@ public void teleport(Player player, Home home) {
             ? Duration.ZERO
             : this.homesSettings.teleportTimeToHomes();
 
-        Position playerLocation = PositionAdapter.convert(player.getLocation());
-        Position homeLocation = PositionAdapter.convert(pre.getLocation());
+        Position playerPosition = PositionAdapter.convert(player.getLocation());
+        Position homeLocation = pre.getPosition();
 
         HomeTeleportEvent post = new HomeTeleportEvent(uniqueId, home);
         Teleport teleport = this.teleportTaskService.createTeleport(
             uniqueId,
-            playerLocation,
+            playerPosition,
             homeLocation,
             teleportTime
         );
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/SetHomeCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/SetHomeCommand.java
index 0ea499913..30f6ef14f 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/SetHomeCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/SetHomeCommand.java
@@ -1,6 +1,7 @@
 package com.eternalcode.core.feature.home.command;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
+import com.eternalcode.commons.bukkit.position.PositionAdapter;
 import com.eternalcode.core.event.EventCaller;
 import com.eternalcode.core.feature.home.HomeService;
 import com.eternalcode.core.feature.home.HomesSettings;
@@ -54,7 +55,7 @@ private void setOrOverrideHome(User user, Player player, String homeName) {
         UUID uniqueId = user.getUniqueId();
 
         if (this.homeService.hasHome(uniqueId, homeName)) {
-            this.homeService.createHome(uniqueId, homeName, player.getLocation());
+            this.homeService.createHome(uniqueId, homeName, PositionAdapter.convert(player.getLocation()));
 
             this.noticeService.create()
                 .user(user)
@@ -84,7 +85,7 @@ private void setOrOverrideHome(User user, Player player, String homeName) {
             return;
         }
 
-        this.homeService.createHome(uniqueId, homeName, player.getLocation());
+        this.homeService.createHome(uniqueId, homeName, PositionAdapter.convert(player.getLocation()));
         this.noticeService.create()
             .user(user)
             .notice(translation -> translation.home().create())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeTable.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeTable.java
index fd8e913d0..48a6b936f 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeTable.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeTable.java
@@ -1,12 +1,12 @@
 package com.eternalcode.core.feature.home.database;
 
-import com.eternalcode.core.database.persister.LocationPersister;
+import com.eternalcode.commons.bukkit.position.Position;
+import com.eternalcode.core.database.persister.PositionPersister;
 import com.eternalcode.core.feature.home.HomeImpl;
 import com.eternalcode.core.feature.home.Home;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 import java.util.UUID;
-import org.bukkit.Location;
 
 @DatabaseTable(tableName = "eternal_core_homes")
 class HomeTable {
@@ -20,24 +20,24 @@ class HomeTable {
     @DatabaseField(columnName = "name")
     private String name;
 
-    @DatabaseField(columnName = "location", persisterClass = LocationPersister.class)
-    private Location location;
+    @DatabaseField(columnName = "location", persisterClass = PositionPersister.class)
+    private Position position;
 
     HomeTable() {}
 
-    HomeTable(UUID uuid, UUID owner, String name, Location location) {
+    HomeTable(UUID uuid, UUID owner, String name, Position position) {
         this.uuid = uuid;
         this.owner = owner;
         this.name = name;
-        this.location = location;
+        this.position = position;
     }
 
     Home toHome() {
-        return new HomeImpl(this.uuid, this.owner, this.name, this.location);
+        return new HomeImpl(this.uuid, this.owner, this.name, this.position);
     }
 
     static HomeTable from(Home home) {
-        return new HomeTable(home.getUuid(), home.getOwner(), home.getName(), home.getLocation());
+        return new HomeTable(home.getUuid(), home.getOwner(), home.getName(), home.getPosition());
     }
 }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java
index c30950cd8..fd1c2c432 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java
@@ -1,6 +1,8 @@
 package com.eternalcode.core.feature.home.homeadmin;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
+import com.eternalcode.commons.bukkit.position.Position;
+import com.eternalcode.commons.bukkit.position.PositionAdapter;
 import com.eternalcode.core.configuration.implementation.PluginConfiguration;
 import com.eternalcode.core.feature.home.Home;
 import com.eternalcode.core.feature.home.HomeManager;
@@ -40,9 +42,9 @@ public HomeAdminCommand(
     }
 
     @Execute(name = "sethome")
-    @DescriptionDocs(description = "Set home for user", arguments = "<user> <home> [location]")
-    void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerHomeEntry, @Arg Optional<Location> location) {
-        Location optionalLocation = location.orElse(sender.getLocation());
+    @DescriptionDocs(description = "Set home for user", arguments = "<user> <home> [position]")
+    void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerHomeEntry, @Arg Optional<Position> position) {
+        Position optionalPosition = position.orElseGet(() -> PositionAdapter.convert(sender.getLocation()));
 
         Home home = playerHomeEntry.home();
         Player player = playerHomeEntry.player();
@@ -52,7 +54,7 @@ void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerH
         String name = home.getName();
 
         if (hasHome) {
-            this.homeManager.createHome(uniqueId, name, optionalLocation);
+            this.homeManager.createHome(uniqueId, name, optionalPosition);
             this.noticeService.create()
                 .notice(translate -> translate.home().overrideHomeLocationAsAdmin())
                 .placeholder("{HOME}", name)
@@ -63,7 +65,7 @@ void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerH
             return;
         }
 
-        this.homeManager.createHome(uniqueId, name, optionalLocation);
+        this.homeManager.createHome(uniqueId, name, optionalPosition);
         this.noticeService.create()
             .notice(translate -> translate.home().createAsAdmin())
             .placeholder("{HOME}", name)
@@ -122,7 +124,8 @@ void home(@Context Player player, @Arg("player home") PlayerHomeEntry playerHome
             return;
         }
 
-        PaperLib.teleportAsync(player, homeOption.get().getLocation());
+        Location homeLocation = PositionAdapter.convert(homeOption.get().getPosition());
+        PaperLib.teleportAsync(player, homeLocation);
     }
 
     @Execute(name = "list")
@@ -140,7 +143,7 @@ void list(@Context Viewer viewer, @Arg User user) {
 
     private String formattedListUserHomes(UUID uniqueId) {
         return this.homeManager.getHomes(uniqueId).stream()
-            .map(home -> home.getName())
+            .map(Home::getName)
             .collect(Collectors.joining(this.pluginConfiguration.format.separator));
     }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
index c042fe214..f25949672 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
@@ -86,14 +86,14 @@ public boolean detainPlayer(Player player, CommandSender detainedBy, @Nullable D
             return false;
         }
 
-        Location lastLocation = player.getLocation();
+        Position lastPosition = PositionAdapter.convert(player.getLocation());
 
         JailedPlayer jailedPlayer = new JailedPlayer(
             player.getUniqueId(),
             Instant.now(),
             time,
             detainedBy.getName(),
-            lastLocation
+            lastPosition
         );
 
         this.prisonerRepository.savePrisoner(jailedPlayer);
@@ -117,8 +117,8 @@ public boolean releasePlayer(Player player) {
         this.prisonerRepository.deletePrisoner(player.getUniqueId());
         this.jailedPlayers.remove(player.getUniqueId());
 
-        if (jailedPlayer != null && jailedPlayer.getLastLocation() != null) {
-            this.teleportService.teleport(player, jailedPlayer.getLastLocation());
+        if (jailedPlayer != null && jailedPlayer.getLastPosition() != null) {
+            this.teleportService.teleport(player, PositionAdapter.convert(jailedPlayer.getLastPosition()));
         } else {
             this.spawnService.teleportToSpawn(player);
         }
@@ -143,8 +143,8 @@ public void releaseAllPlayers() {
             playersToRelease.add(uuid);
 
             if (player != null) {
-                this.teleportService.teleport(player, jailedPlayer.getLastLocation() != null
-                    ? jailedPlayer.getLastLocation()
+                this.teleportService.teleport(player, jailedPlayer.getLastPosition() != null
+                    ? PositionAdapter.convert(jailedPlayer.getLastPosition())
                     : this.spawnService.getSpawnLocation());
             }
         });
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
index 9d765f6cb..3cc293305 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
@@ -1,10 +1,10 @@
 package com.eternalcode.core.feature.jail;
 
-import com.eternalcode.core.database.persister.LocationPersister;
+import com.eternalcode.commons.bukkit.position.Position;
+import com.eternalcode.core.database.persister.PositionPersister;
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import org.bukkit.Location;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -26,22 +26,26 @@ class PrisonerTable {
     @DatabaseField(columnName = "detained_by")
     private String detainedBy;
 
-    @DatabaseField(columnName = "last_location", persisterClass = LocationPersister.class)
-    private Location lastLocation;
+    @DatabaseField(
+        columnName = "last_position",
+        persisterClass = PositionPersister.class,
+        dataType = DataType.LONG_STRING
+    )
+    private Position lastPosition;
 
     PrisonerTable() {
     }
 
-    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy, Location lastLocation) {
+    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy, Position lastPosition) {
         this.uuid = uuid;
         this.detainedAt = detainedAt;
         this.duration = duration;
         this.detainedBy = detainedBy;
-        this.lastLocation = lastLocation;
+        this.lastPosition = lastPosition;
     }
 
     JailedPlayer toPrisoner() {
-        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy, this.lastLocation);
+        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy, this.lastPosition);
     }
 
     static PrisonerTable from(JailedPlayer jailedPlayer) {
@@ -50,7 +54,7 @@ static PrisonerTable from(JailedPlayer jailedPlayer) {
             jailedPlayer.getDetainedAt(),
             jailedPlayer.getPrisonTime(),
             jailedPlayer.getDetainedBy(),
-            jailedPlayer.getLastLocation()
+            jailedPlayer.getLastPosition()
         );
     }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/LiteCommandsSetup.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/LiteCommandsSetup.java
index fd35d26ac..65a37d059 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/LiteCommandsSetup.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/LiteCommandsSetup.java
@@ -45,7 +45,7 @@ class LiteCommandsSetup {
                 .notice(translation -> translation.argument().incorrectLocation())
                 .placeholder("{LOCATION}", input)
             )
-            .extension(new LiteAdventurePlatformExtension<CommandSender>(audiencesProvider), extension -> extension
+            .extension(new LiteAdventurePlatformExtension<>(audiencesProvider), extension -> extension
                 .serializer(miniMessage)
             );
     }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/GameModeArgument.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/GameModeArgument.java
index cd86f5969..3d2397238 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/GameModeArgument.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/GameModeArgument.java
@@ -48,5 +48,4 @@ public SuggestionResult suggest(Invocation<CommandSender> invocation, Argument<G
             .stream()
             .collect(SuggestionResult.collector());
     }
-
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/PositionArgument.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/PositionArgument.java
new file mode 100644
index 000000000..0604e6acb
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/PositionArgument.java
@@ -0,0 +1,55 @@
+package com.eternalcode.core.litecommand.argument;
+
+import com.eternalcode.commons.bukkit.position.Position;
+import com.eternalcode.core.injector.annotations.Inject;
+import com.eternalcode.core.injector.annotations.lite.LiteArgument;
+import com.eternalcode.core.translation.Translation;
+import com.eternalcode.core.translation.TranslationManager;
+import dev.rollczi.litecommands.argument.Argument;
+import dev.rollczi.litecommands.argument.parser.ParseResult;
+import dev.rollczi.litecommands.invocation.Invocation;
+import dev.rollczi.litecommands.suggestion.SuggestionContext;
+import dev.rollczi.litecommands.suggestion.SuggestionResult;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@LiteArgument(type = Position.class)
+public class PositionArgument extends AbstractViewerArgument<Position> {
+
+    @Inject
+    PositionArgument(TranslationManager translationManager) {
+        super(translationManager);
+    }
+
+    @Override
+    public ParseResult<Position> parse(Invocation<CommandSender> invocation, String argument, Translation translation) {
+        try {
+            Position position = Position.parse(argument);
+            return ParseResult.success(position);
+        } catch (IllegalArgumentException exception) {
+            return ParseResult.failure(translation.argument().invalidPosition());
+        }
+    }
+
+    @Override
+    public SuggestionResult suggest(Invocation<CommandSender> invocation, Argument<Position> argument, SuggestionContext context) {
+        CommandSender sender = invocation.sender();
+
+        if (sender instanceof Player player) {
+            org.bukkit.Location location = player.getLocation();
+
+            Position currentPosition = new Position(
+                location.getX(),
+                location.getY(),
+                location.getZ(),
+                location.getYaw(),
+                location.getPitch(),
+                location.getWorld().getName()
+            );
+
+            return SuggestionResult.of(currentPosition.toString());
+        }
+
+        return SuggestionResult.of("Position{x=0.0, y=64.0, z=0.0, yaw=0.0, pitch=0.0, world='world'}");
+    }
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java
index 752990867..af4651ef4 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java
@@ -21,4 +21,5 @@ public interface ArgumentMessages {
     Notice worldDoesntExist();
     Notice incorrectNumberOfChunks();
     Notice incorrectLocation();
+    Notice invalidPosition();
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java
index 2392054aa..f92e775c1 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java
@@ -33,4 +33,5 @@ public class ENArgumentMessages extends OkaeriConfig implements ArgumentMessages
     public Notice worldDoesntExist = Notice.chat("<red>✘ <dark_red>World <red>{WORLD} <dark_red>doesn't exist!");
     public Notice incorrectNumberOfChunks = Notice.chat("<red>✘ <dark_red>Incorrect number of chunks!");
     public Notice incorrectLocation = Notice.chat("<red>✘ <dark_red>Incorrect location format! <red>({LOCATION})");
+    public Notice invalidPosition = Notice.chat("<red>✘ <dark_red>Invalid position format! <red>({POSITION})");
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java
index 0ce55371c..8ca13f38f 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java
@@ -34,5 +34,5 @@ public class PLArgumentMessages extends OkaeriConfig implements ArgumentMessages
     public Notice worldDoesntExist = Notice.chat("<red>✘ <dark_red>Świat <dark_red>{WORLD} <red>nie istnieje!");
     public Notice incorrectNumberOfChunks = Notice.chat("<red>✘ <dark_red>Niepoprawna liczba chunków!");
     public Notice incorrectLocation = Notice.chat("<red>✘ <dark_red>Niepoprawna lokalizacja! <red>({LOCATION})");
-
+    public Notice invalidPosition = Notice.chat("<red>✘ <dark_red>Niepoprawna pozycja! <red>({POSITION})");
 }

From c3bb59ac60f828199545ea4b4739110b325460c7 Mon Sep 17 00:00:00 2001
From: Igor Michalski <65646893+igoyek@users.noreply.github.com>
Date: Fri, 22 Aug 2025 14:32:45 +0200
Subject: [PATCH 08/11] Remove PositionArgument and related messages

Deleted PositionArgument class and removed references to invalidPosition messages in ArgumentMessages, ENArgumentMessages, and PLArgumentMessages. Updated HomeAdminCommand to use Location instead of Position for home setting, simplifying argument handling.

Took 25 minutes
---
 .../home/homeadmin/HomeAdminCommand.java      | 10 ++--
 .../argument/PositionArgument.java            | 55 -------------------
 .../argument/messages/ArgumentMessages.java   |  1 -
 .../argument/messages/ENArgumentMessages.java |  1 -
 .../argument/messages/PLArgumentMessages.java |  1 -
 5 files changed, 6 insertions(+), 62 deletions(-)
 delete mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/PositionArgument.java

diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java
index fd1c2c432..9c54d7338 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java
@@ -43,8 +43,8 @@ public HomeAdminCommand(
 
     @Execute(name = "sethome")
     @DescriptionDocs(description = "Set home for user", arguments = "<user> <home> [position]")
-    void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerHomeEntry, @Arg Optional<Position> position) {
-        Position optionalPosition = position.orElseGet(() -> PositionAdapter.convert(sender.getLocation()));
+    void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerHomeEntry, @Arg Optional<Location> location) {
+        Location optionalLocation = location.orElse(sender.getLocation());
 
         Home home = playerHomeEntry.home();
         Player player = playerHomeEntry.player();
@@ -53,8 +53,10 @@ void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerH
         boolean hasHome = this.homeManager.hasHome(uniqueId, home);
         String name = home.getName();
 
+        Position position = PositionAdapter.convert(optionalLocation);
+
         if (hasHome) {
-            this.homeManager.createHome(uniqueId, name, optionalPosition);
+            this.homeManager.createHome(uniqueId, name, position);
             this.noticeService.create()
                 .notice(translate -> translate.home().overrideHomeLocationAsAdmin())
                 .placeholder("{HOME}", name)
@@ -65,7 +67,7 @@ void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerH
             return;
         }
 
-        this.homeManager.createHome(uniqueId, name, optionalPosition);
+        this.homeManager.createHome(uniqueId, name, position);
         this.noticeService.create()
             .notice(translate -> translate.home().createAsAdmin())
             .placeholder("{HOME}", name)
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/PositionArgument.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/PositionArgument.java
deleted file mode 100644
index 0604e6acb..000000000
--- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/PositionArgument.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.eternalcode.core.litecommand.argument;
-
-import com.eternalcode.commons.bukkit.position.Position;
-import com.eternalcode.core.injector.annotations.Inject;
-import com.eternalcode.core.injector.annotations.lite.LiteArgument;
-import com.eternalcode.core.translation.Translation;
-import com.eternalcode.core.translation.TranslationManager;
-import dev.rollczi.litecommands.argument.Argument;
-import dev.rollczi.litecommands.argument.parser.ParseResult;
-import dev.rollczi.litecommands.invocation.Invocation;
-import dev.rollczi.litecommands.suggestion.SuggestionContext;
-import dev.rollczi.litecommands.suggestion.SuggestionResult;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@LiteArgument(type = Position.class)
-public class PositionArgument extends AbstractViewerArgument<Position> {
-
-    @Inject
-    PositionArgument(TranslationManager translationManager) {
-        super(translationManager);
-    }
-
-    @Override
-    public ParseResult<Position> parse(Invocation<CommandSender> invocation, String argument, Translation translation) {
-        try {
-            Position position = Position.parse(argument);
-            return ParseResult.success(position);
-        } catch (IllegalArgumentException exception) {
-            return ParseResult.failure(translation.argument().invalidPosition());
-        }
-    }
-
-    @Override
-    public SuggestionResult suggest(Invocation<CommandSender> invocation, Argument<Position> argument, SuggestionContext context) {
-        CommandSender sender = invocation.sender();
-
-        if (sender instanceof Player player) {
-            org.bukkit.Location location = player.getLocation();
-
-            Position currentPosition = new Position(
-                location.getX(),
-                location.getY(),
-                location.getZ(),
-                location.getYaw(),
-                location.getPitch(),
-                location.getWorld().getName()
-            );
-
-            return SuggestionResult.of(currentPosition.toString());
-        }
-
-        return SuggestionResult.of("Position{x=0.0, y=64.0, z=0.0, yaw=0.0, pitch=0.0, world='world'}");
-    }
-}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java
index af4651ef4..752990867 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java
@@ -21,5 +21,4 @@ public interface ArgumentMessages {
     Notice worldDoesntExist();
     Notice incorrectNumberOfChunks();
     Notice incorrectLocation();
-    Notice invalidPosition();
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java
index f92e775c1..2392054aa 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java
@@ -33,5 +33,4 @@ public class ENArgumentMessages extends OkaeriConfig implements ArgumentMessages
     public Notice worldDoesntExist = Notice.chat("<red>✘ <dark_red>World <red>{WORLD} <dark_red>doesn't exist!");
     public Notice incorrectNumberOfChunks = Notice.chat("<red>✘ <dark_red>Incorrect number of chunks!");
     public Notice incorrectLocation = Notice.chat("<red>✘ <dark_red>Incorrect location format! <red>({LOCATION})");
-    public Notice invalidPosition = Notice.chat("<red>✘ <dark_red>Invalid position format! <red>({POSITION})");
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java
index 8ca13f38f..f2ac5e8f8 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java
@@ -34,5 +34,4 @@ public class PLArgumentMessages extends OkaeriConfig implements ArgumentMessages
     public Notice worldDoesntExist = Notice.chat("<red>✘ <dark_red>Świat <dark_red>{WORLD} <red>nie istnieje!");
     public Notice incorrectNumberOfChunks = Notice.chat("<red>✘ <dark_red>Niepoprawna liczba chunków!");
     public Notice incorrectLocation = Notice.chat("<red>✘ <dark_red>Niepoprawna lokalizacja! <red>({LOCATION})");
-    public Notice invalidPosition = Notice.chat("<red>✘ <dark_red>Niepoprawna pozycja! <red>({POSITION})");
 }

From d640f4c63226e1f6834e15b9864180ebae773da8 Mon Sep 17 00:00:00 2001
From: Igor Michalski <65646893+igoyek@users.noreply.github.com>
Date: Fri, 22 Aug 2025 14:44:17 +0200
Subject: [PATCH 09/11] Ensure home location uses sender's world and
 orientation

When setting a home for a user, the location now explicitly uses the sender's world, yaw, and pitch to avoid inconsistencies if a custom location is provided without these values.

Took 8 minutes
---
 .../core/feature/home/homeadmin/HomeAdminCommand.java          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java
index 9c54d7338..273ee684d 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java
@@ -45,6 +45,9 @@ public HomeAdminCommand(
     @DescriptionDocs(description = "Set home for user", arguments = "<user> <home> [position]")
     void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerHomeEntry, @Arg Optional<Location> location) {
         Location optionalLocation = location.orElse(sender.getLocation());
+        optionalLocation.setWorld(sender.getWorld());
+        optionalLocation.setYaw(sender.getLocation().getYaw());
+        optionalLocation.setPitch(sender.getLocation().getPitch());
 
         Home home = playerHomeEntry.home();
         Player player = playerHomeEntry.player();

From e09ca18d6c9b8135ffc489de76ebe841751f6381 Mon Sep 17 00:00:00 2001
From: Igor Michalski <65646893+igoyek@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:20:48 +0200
Subject: [PATCH 10/11] Refactor jail section migration and improve Position
 handling

Renamed migration class and references from 'Move_jail_to_dedicated_section' to 'Rename_jail_section' for clarity. Updated PositionPersister to use Position's toString method and added type safety. Minor import and formatting adjustments in JailedPlayer and PrisonerTable.

Took 35 minutes
---
 .../com/eternalcode/core/feature/jail/JailedPlayer.java   | 1 -
 ...ction.java => Migration_0010_Rename_jail_section.java} | 6 +++---
 .../core/configuration/migrations/Migrations.java         | 2 +-
 .../core/database/persister/PositionPersister.java        | 8 ++++++--
 .../com/eternalcode/core/feature/jail/PrisonerTable.java  | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)
 rename eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/{Migration_0010_Move_jail_to_dedicated_section.java => Migration_0010_Rename_jail_section.java} (89%)

diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
index 889996b5f..e8a63c298 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
@@ -1,7 +1,6 @@
 package com.eternalcode.core.feature.jail;
 
 import com.eternalcode.commons.bukkit.position.Position;
-import org.bukkit.Location;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Move_jail_to_dedicated_section.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Rename_jail_section.java
similarity index 89%
rename from eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Move_jail_to_dedicated_section.java
rename to eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Rename_jail_section.java
index 4f3a96500..50f5e72ca 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Move_jail_to_dedicated_section.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Rename_jail_section.java
@@ -4,11 +4,11 @@
 
 import eu.okaeri.configs.migrate.builtin.NamedMigration;
 
-public class Migration_0010_Move_jail_to_dedicated_section extends NamedMigration {
+public class Migration_0010_Rename_jail_section extends NamedMigration {
 
-    Migration_0010_Move_jail_to_dedicated_section() {
+    Migration_0010_Rename_jail_section() {
         super(
-            "Move jail to dedicated section",
+            "Rename jail section",
 
             move("jailSection.jailLocationSet", "jail.locationSet"),
             move("jailSection.jailLocationRemove", "jail.locationRemove"),
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
index 2c194b855..b0c61da90 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
@@ -12,7 +12,7 @@ public class Migrations {
         new Migration_0007_Move_clear_to_dedicated_section(),
         new Migration_0008_Move_repair_to_dedicated_section(),
         new Migration_0009_Rename_allowed_to_restricted_jail_commands(),
-        new Migration_0010_Move_jail_to_dedicated_section()
+        new Migration_0010_Rename_jail_section()
     };
 
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/PositionPersister.java b/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/PositionPersister.java
index e103a3d01..f9239cd8b 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/PositionPersister.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/PositionPersister.java
@@ -1,6 +1,7 @@
 package com.eternalcode.core.database.persister;
 
 import com.eternalcode.commons.bukkit.position.Position;
+import com.eternalcode.commons.bukkit.position.PositionAdapter;
 import com.j256.ormlite.field.FieldType;
 import com.j256.ormlite.field.SqlType;
 import com.j256.ormlite.field.types.BaseDataType;
@@ -22,8 +23,11 @@ public Object javaToSqlArg(FieldType fieldType, Object javaObject) {
             return null;
         }
 
-        Position position = (Position) javaObject;
-        return position.world() + "/" + position.x() + "/" + position.y() + "/" + position.z() + "/" + position.yaw() + "/" + position.pitch();
+        if (!(javaObject instanceof Position position)) {
+            throw new IllegalArgumentException("Invalid object type: " + javaObject.getClass().getName());
+        }
+
+        return position.toString();
     }
 
     @Override
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
index 3cc293305..92d1ac9b1 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
@@ -1,6 +1,7 @@
 package com.eternalcode.core.feature.jail;
 
 import com.eternalcode.commons.bukkit.position.Position;
+import com.eternalcode.commons.bukkit.position.PositionAdapter;
 import com.eternalcode.core.database.persister.PositionPersister;
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.DatabaseField;
@@ -16,7 +17,6 @@ class PrisonerTable {
     @DatabaseField(columnName = "id", id = true)
     private UUID uuid;
 
-
     @DatabaseField(columnName = "detained_at", dataType = DataType.SERIALIZABLE)
     private Instant detainedAt;
 
@@ -45,7 +45,7 @@ class PrisonerTable {
     }
 
     JailedPlayer toPrisoner() {
-        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy, this.lastPosition);
+        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy, lastPosition);
     }
 
     static PrisonerTable from(JailedPlayer jailedPlayer) {

From 6c38f6f70d37bfdf368f7bba2001b09f8caa41e9 Mon Sep 17 00:00:00 2001
From: Igor Michalski <65646893+igoyek@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:21:14 +0200
Subject: [PATCH 11/11] Remove unused import

Took 2 minutes
---
 .../core/feature/home/event/PreHomeTeleportEvent.java            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/PreHomeTeleportEvent.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/PreHomeTeleportEvent.java
index 70bd3c37c..96be3709b 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/PreHomeTeleportEvent.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/PreHomeTeleportEvent.java
@@ -3,7 +3,6 @@
 import com.eternalcode.commons.bukkit.position.Position;
 import com.eternalcode.core.feature.home.Home;
 import java.util.UUID;
-import org.bukkit.Location;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;