From bf9c02bc16dc3a1bddb4d0eeebb30a90b6b5eb2f Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 26 Sep 2024 07:54:04 +0200 Subject: [PATCH] Fix failed chr save due to null jail expiration --- src/main/java/client/Character.java | 2 +- src/main/java/database/character/CharacterRepository.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index 34db6c5472..ea8ad1c379 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -8487,7 +8487,7 @@ public class Character extends AbstractCharacterObject { ps.setInt(46, stats.omokLosses()); ps.setInt(47, stats.omokTies()); ps.setString(48, stats.dataString()); - ps.setLong(49, stats.jailExpiration()); + ps.setLong(49, Objects.requireNonNullElse(stats.jailExpiration(), 0L)); ps.setInt(50, Objects.requireNonNullElse(stats.partnerId(), -1)); ps.setInt(51, Objects.requireNonNullElse(stats.marriageItemId(), -1)); ps.setTimestamp(52, new Timestamp(stats.lastExpGainTime())); diff --git a/src/main/java/database/character/CharacterRepository.java b/src/main/java/database/character/CharacterRepository.java index e7d1931120..f612c8c18c 100644 --- a/src/main/java/database/character/CharacterRepository.java +++ b/src/main/java/database/character/CharacterRepository.java @@ -127,8 +127,8 @@ public class CharacterRepository { .bind("ariant_points", stats.ariantPoints()) .bind("data_string", stats.dataString()) .bind("party_search", stats.canRecvPartySearchInvite()) - .bind("jail_expire", new Timestamp(stats.jailExpiration())) - .bind("last_exp_gain", new Timestamp(stats.lastExpGainTime())) + .bind("jail_expire", stats.jailExpiration() != null ? new Timestamp(stats.jailExpiration()) : null) + .bind("last_exp_gain", stats.lastExpGainTime() != null ? new Timestamp(stats.lastExpGainTime()) : null) .bind("partner_id", stats.partnerId()) .bind("marriage_item_id", stats.marriageItemId()) .bind("id", stats.id())