Added option to not TP jailed player out of jail at end of sentence

Author: FugLong

README.md

@@ -18,8 +18,8 @@ A classic jail mod for Minecraft Fabric servers (1.21.8+) - just like the good o
   - Teleport or escape (automatic teleport back to jail)
 - **Configurable**: Extensive config file for customization
 - **Data Persistence**: All jails and jailed players are saved and restored on server restart
-- **Auto-Release**: Players are automatically released when their sentence expires and teleported back
-- **Original Location Tracking**: Players are teleported back to their original location upon release
+- **Auto-Release**: Players are automatically released when their sentence expires
+- **Original Location Tracking**: Players are teleported back to their original location upon release (configurable)
 - **Logout/Login Handling**: Players remain jailed across logout/login and are auto-released if sentence expired offline
 - **Multiple Jails**: Create multiple jails and choose which one to send players to
 - **Essential Commands Compatible**: Fully compatible with [Essential Commands](https://modrinth.com/mod/essential-commands) - the recommended companion mod
@@ -34,7 +34,7 @@ A classic jail mod for Minecraft Fabric servers (1.21.8+) - just like the good o
 - `/jail <player> <jail_name> <time> <reason>` - Jail a player in a specific jail
   - Example: `/jail Steve spawn 30 Being annoying`
 
-- `/jail release <player>` - Release a player from jail early and teleport them back to where they were
+- `/jail release <player>` - Release a player from jail early (teleports back to original location if enabled in config)
 
 - `/jail time` - Check your own remaining jail time (available to jailed players)
 - `/jail time <player>` - Check any player's jail time (admin only - requires `oldschooljail.jail` permission)
@@ -78,6 +78,9 @@ The TOML file includes detailed comments for each option. Here's what you can co
 - `block_block_placing` - Prevent placing blocks  
 - `block_interaction` - Prevent interacting with blocks
 
+**Release Settings:**
+- `teleport_back_on_release` - Teleport players back to original location when released (if false, players must walk out manually)
+
 **Messages:**
 - `release` - Message on manual release
 - `jail_expired` - Message when sentence expires

src/main/java/com/oldschooljail/command/JailCommand.java

@@ -278,12 +278,14 @@ private static int deleteJail(CommandContext<ServerCommandSource> context) throw
 			return 0;
 		}
 
-		// Release players in this jail and teleport them back
+		// Release players in this jail and teleport them back (if enabled)
 		JailedPlayersData jailedData = OldSchoolJailMod.getJailedPlayersData();
 		for (JailedPlayer jp : jailedData.getPlayersInJail(name)) {
 			ServerPlayerEntity player = source.getServer().getPlayerManager().getPlayer(jp.getPlayerUuid());
 			if (player != null) {
-				jailedData.teleportToOriginalLocation(player, jp, source.getServer());
+				if (OldSchoolJailMod.getConfig().teleportBackOnRelease) {
+					jailedData.teleportToOriginalLocation(player, jp, source.getServer());
+				}
 				player.sendMessage(Text.literal("§aYou have been released because the jail was deleted."));
 			}
 			jailedData.releasePlayer(jp.getPlayerUuid());
@@ -314,10 +316,10 @@ private static int releasePlayer(CommandContext<ServerCommandSource> context) th
 		// Get jailed player data before releasing
 		JailedPlayer jailedPlayer = jailedData.getJailedPlayer(target.getUuid());
 
-		// Release and teleport back
+		// Release and teleport back (if enabled)
 		jailedData.releasePlayer(target.getUuid());
 
-		if (jailedPlayer != null) {
+		if (jailedPlayer != null && OldSchoolJailMod.getConfig().teleportBackOnRelease) {
 			jailedData.teleportToOriginalLocation(target, jailedPlayer, source.getServer());
 		}
 

src/main/java/com/oldschooljail/config/JailConfig.java

@@ -24,6 +24,7 @@ public enum TimeUnit {
 	public boolean blockBlockBreaking = true;
 	public boolean blockBlockPlacing = true;
 	public boolean blockInteraction = true;
+	public boolean teleportBackOnRelease = true;
 	public String releaseMessage = "§aYou have been released from jail!";
 	public String jailExpiredMessage = "§aYour jail sentence has expired. You are now free!";
 
@@ -46,6 +47,7 @@ public static JailConfig load() {
 				config.blockBlockBreaking = fileConfig.getOrElse("restrictions.block_block_breaking", true);
 				config.blockBlockPlacing = fileConfig.getOrElse("restrictions.block_block_placing", true);
 				config.blockInteraction = fileConfig.getOrElse("restrictions.block_interaction", true);
+				config.teleportBackOnRelease = fileConfig.getOrElse("release.teleport_back_on_release", true);
 
 				config.releaseMessage = fileConfig.getOrElse("messages.release", "§aYou have been released from jail!");
 				config.jailExpiredMessage = fileConfig.getOrElse("messages.jail_expired", "§aYour jail sentence has expired. You are now free!");
@@ -121,6 +123,16 @@ public void save() {
 				" Prevent interacting with blocks (buttons, levers, doors, etc.) while jailed\n" +
 				" Recommended: true");
 
+			// Release settings
+			config.setComment("release",
+				" Settings for when players are released from jail");
+			
+			config.set("release.teleport_back_on_release", teleportBackOnRelease);
+			config.setComment("release.teleport_back_on_release",
+				" Teleport players back to their original location when released\n" +
+				" If false, players must walk out of jail manually\n" +
+				" Recommended: true (prevents confusion about where they are)");
+			
 			// Message settings
 			config.setComment("messages",
 				" Customizable messages sent to players\n" +

src/main/java/com/oldschooljail/data/JailedPlayersData.java

@@ -81,7 +81,9 @@ public void startReleaseTimer(MinecraftServer server) {
 						if (player != null) {
 							// Player is online - release them immediately
 							player.sendMessage(Text.literal(OldSchoolJailMod.getConfig().jailExpiredMessage));
-							teleportToOriginalLocation(player, jp, server);
+							if (OldSchoolJailMod.getConfig().teleportBackOnRelease) {
+								teleportToOriginalLocation(player, jp, server);
+							}
 							releasePlayer(uuid);
 						}
 						// If player is offline, don't release them yet - let PlayerEventHandler handle it when they rejoin

src/main/java/com/oldschooljail/event/PlayerEventHandler.java

@@ -22,9 +22,11 @@ public static void register() {
 
 			if (jailedPlayer != null) {
 				if (jailedPlayer.shouldBeReleased()) {
-					// Sentence expired while offline - release and teleport back
+					// Sentence expired while offline - release and teleport back (if enabled)
 					player.sendMessage(Text.literal(OldSchoolJailMod.getConfig().jailExpiredMessage));
-					jailedData.teleportToOriginalLocation(player, jailedPlayer, server);
+					if (OldSchoolJailMod.getConfig().teleportBackOnRelease) {
+						jailedData.teleportToOriginalLocation(player, jailedPlayer, server);
+					}
 					jailedData.releasePlayer(player.getUuid());
 				} else {
 					// Still jailed - teleport to jail
@@ -38,7 +40,9 @@ public static void register() {
 					} else {
 						// Jail was deleted while offline - release them
 						player.sendMessage(Text.literal("§aYour jail was removed. You are free!"));
-						jailedData.teleportToOriginalLocation(player, jailedPlayer, server);
+						if (OldSchoolJailMod.getConfig().teleportBackOnRelease) {
+							jailedData.teleportToOriginalLocation(player, jailedPlayer, server);
+						}
 						jailedData.releasePlayer(player.getUuid());
 					}
 				}