- Fix killed players that are sent to jail not keeping their So You've

Been Jailed book. - Closes #5989.
TownyAdvanced · Jun 30, 2022 · 812219b · 812219b
1 parent 6376015
commit 812219b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.palmergames.bukkit.towny</groupId>
     <artifactId>towny</artifactId>
     <packaging>jar</packaging>
-    <version>0.98.2.7</version>
+    <version>0.98.2.8</version>
 
     <licenses>
         <license>

diff --git a/resources/ChangeLog.txt b/resources/ChangeLog.txt
@@ -7545,4 +7545,6 @@ v0.92.0.11:
   - Fix TownPreRuinedEvent firing Async.
   - Handle more kinds of changes to cauldrons, courtesy of Warriorrrr with PR #5990.
 0.98.2.8:
-  - Add simpler, more convenient way to get a Translator from a CommandSender.
+  - Add simpler, more convenient way to get a Translator from a CommandSender.
+  - Fix killed players that are sent to jail not keeping their So You've Been Jailed book.
+    - Closes #5989.
diff --git a/src/com/palmergames/bukkit/towny/listeners/TownyEntityMonitorListener.java b/src/com/palmergames/bukkit/towny/listeners/TownyEntityMonitorListener.java
@@ -389,8 +389,11 @@ public void isJailingAttackers(Player attackerPlayer, Player defenderPlayer, Res
 				if (!TownyUniverse.getInstance().getPermissionSource().testPermission(attackerPlayer, PermissionNodes.TOWNY_OUTLAW_JAILER.getNode()))
 					return;
 
-				// Send to jail. Hours are set later on.
-				JailUtil.jailResident(defenderResident, attackerTown.getPrimaryJail(), 0, JailReason.OUTLAW_DEATH.getHours(), JailReason.OUTLAW_DEATH, attackerResident.getPlayer());
+				// Send to jail. Hours are set later on. Task is set 1 tick later so the Jail book isn't removed from their death.
+				Bukkit.getScheduler().runTaskLater(
+					plugin, ()-> 
+					JailUtil.jailResident(defenderResident, attackerTown.getPrimaryJail(), 0, JailReason.OUTLAW_DEATH.getHours(), JailReason.OUTLAW_DEATH, attackerResident.getPlayer()),
+					1);
 				return;
 			}
 		}