From c61879d26450c7a085d6873cb811660ffc4fd747 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 21 Nov 2019 18:25:46 +0000
Subject: [PATCH] Fixed character auto save task.

---
 L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini           | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_2.5_Underground/dist/game/config/General.ini       | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_3.0_Helios/dist/game/config/General.ini            | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini      | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_5.0_Salvation/dist/game/config/General.ini         | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_5.5_EtinasFate/dist/game/config/General.ini        | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_6.0_Fafurion/dist/game/config/General.ini          | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_7.0_PreludeOfWar/dist/game/config/General.ini      | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini       | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 3 +--
 L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini       | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini   | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_Classic_2.1_Zaken/dist/game/config/General.ini     | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_Classic_2.2_Antharas/dist/game/config/General.ini  | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../dist/game/config/General.ini                              | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../dist/game/config/General.ini                              | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 L2J_Mobius_Classic_Interlude/dist/game/config/General.ini     | 4 ++--
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 34 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini
index df1dc2906a..c05bd761cc 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 39c1189614..ecb26ff92f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8155,7 +8155,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/General.ini b/L2J_Mobius_2.5_Underground/dist/game/config/General.ini
index cd13c21cdc..aa5e06b0d9 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/config/General.ini
+++ b/L2J_Mobius_2.5_Underground/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index fe90b33c5a..4d70624935 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8162,7 +8162,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/General.ini b/L2J_Mobius_3.0_Helios/dist/game/config/General.ini
index cd13c21cdc..aa5e06b0d9 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/config/General.ini
+++ b/L2J_Mobius_3.0_Helios/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 8635098a93..c9cc95cb6e 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8164,7 +8164,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini
index cd13c21cdc..aa5e06b0d9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index ce64319859..98c1ea4c3a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8159,7 +8159,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/config/General.ini b/L2J_Mobius_5.0_Salvation/dist/game/config/General.ini
index cd13c21cdc..aa5e06b0d9 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/config/General.ini
+++ b/L2J_Mobius_5.0_Salvation/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index cddc6ec1f7..879f2910ab 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8137,7 +8137,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/config/General.ini b/L2J_Mobius_5.5_EtinasFate/dist/game/config/General.ini
index cd13c21cdc..aa5e06b0d9 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/config/General.ini
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index ab600dfb64..d99f4030fb 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8137,7 +8137,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/config/General.ini b/L2J_Mobius_6.0_Fafurion/dist/game/config/General.ini
index cd13c21cdc..aa5e06b0d9 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/config/General.ini
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 8fb091d240..ddc4d30dbc 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8138,7 +8138,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/General.ini b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/General.ini
index cd13c21cdc..aa5e06b0d9 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/General.ini
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 6eb1f6a826..4b78ecc4fa 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8099,7 +8099,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini
index dfd5c49814..4013528267 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini
@@ -179,8 +179,8 @@ CharacterDataStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 356ce559b6..81dfdd0432 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -38,7 +38,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
@@ -8407,7 +8406,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini
index dfd5c49814..4013528267 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini
@@ -179,8 +179,8 @@ CharacterDataStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index ca506ebf8b..ddb798481c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8285,7 +8285,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini
index 916ef79a39..bc4b0889cb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index bb3142863e..1512e5d9bf 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8113,7 +8113,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/General.ini b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/General.ini
index 916ef79a39..bc4b0889cb 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 55ae79f04c..9077ba14c0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8114,7 +8114,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/General.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/General.ini
index 916ef79a39..bc4b0889cb 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index b251050c2b..245603185f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8099,7 +8099,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/General.ini b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/General.ini
index 916ef79a39..bc4b0889cb 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 16f8d9f5a8..788ebfed52 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8126,7 +8126,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/General.ini b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/General.ini
index 916ef79a39..bc4b0889cb 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 232e09a375..023bbd495e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8126,7 +8126,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini
index 916ef79a39..bc4b0889cb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 0ee7d91b01..df12520703 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8026,7 +8026,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini b/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini
index 916ef79a39..bc4b0889cb 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini
@@ -182,8 +182,8 @@ ClanVariablesStoreInterval = 15
 LazyItemsUpdate = False
 
 # When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
-# Default: False
-UpdateItemsOnCharStore = False
+# Default: True
+UpdateItemsOnCharStore = True
 
 # Also delete from world misc. items dropped by players (all except equip-able items).
 # Notes:
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 6ccf7ef0d2..452768fb57 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -8114,7 +8114,7 @@ public class PlayerInstance extends Playable
 	{
 		if ((Config.CHAR_DATA_STORE_INTERVAL > 0) && (_autoSaveTask == null))
 		{
-			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, 300_000L, TimeUnit.MINUTES.toMillis(Config.CHAR_DATA_STORE_INTERVAL));
+			_autoSaveTask = ThreadPool.scheduleAtFixedRate(this::autoSave, Config.CHAR_DATA_STORE_INTERVAL, Config.CHAR_DATA_STORE_INTERVAL);
 		}
 	}