Direct almost all chr saving through CharacterSaver

Client#disconnectInternal remains.
Had to remove some configurable save points to keep it simple.

src/main/java/client/Character.java

@@ -50,8 +50,6 @@ import net.server.guild.Alliance;
 import net.server.guild.Guild;
 import net.server.guild.GuildCharacter;
 import net.server.guild.GuildPackets;
-import net.server.services.task.world.CharacterSaveService;
-import net.server.services.type.WorldServices;
 import net.server.world.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -6449,15 +6447,6 @@ public class Character extends AbstractCharacterObject {
         }
 
         if (level % 20 == 0) {
-            if (YamlConfig.config.server.USE_ADD_SLOTS_BY_LEVEL == true) {
-                if (!isGM()) {
-                    for (byte i = 1; i < 5; i++) {
-                        gainSlots(i, 4, true);
-                    }
-
-                    this.yellowMessage("You reached level " + level + ". Congratulations! As a token of your success, your inventory has been expanded a little bit.");
-                }
-            }
             if (YamlConfig.config.server.USE_ADD_RATES_BY_LEVEL == true) { //For the rate upgrade
                 revertLastPlayerRates();
                 setPlayerRates();
@@ -8240,20 +8229,10 @@ public class Character extends AbstractCharacterObject {
         return false;
     }
 
+    // TODO: all callers should use CharacterSaver instead.
+    // It's supposed to act as a proxy to these 2 methods (as a first step towards taking full ownership of character saving)
     public void saveCharToDB() {
-        if (YamlConfig.config.server.USE_AUTOSAVE) {
-            Runnable r = new Runnable() {
-                @Override
-                public void run() {
-                    saveCharToDB(true);
-                }
-            };
-
-            CharacterSaveService service = (CharacterSaveService) getWorldServer().getServiceAccess(WorldServices.SAVE_CHARACTER);
-            service.registerSaveCharacter(this.getId(), r);
-        } else {
-            saveCharToDB(true);
-        }
+        saveCharToDB(true);
     }
 
     //ItemFactory saveItems and monsterbook.saveCards are the most time consuming here.
@@ -9179,33 +9158,28 @@ public class Character extends AbstractCharacterObject {
         return slots <= 96;
     }
 
-    public boolean gainSlots(int type, int slots) {
-        return gainSlots(type, slots, true);
-    }
-
     public boolean gainSlots(int type, int slots, boolean update) {
-        int newLimit = gainSlotsInternal(type, slots);
-        if (newLimit != -1) {
-            this.saveCharToDB();
-            if (update) {
-                sendPacket(PacketCreator.updateInventorySlotLimit(type, newLimit));
-            }
-            return true;
-        } else {
+        Integer updatedLimit = gainSlotsInternal(type, slots);
+        if (updatedLimit == null) {
             return false;
         }
+
+        if (update) {
+            sendPacket(PacketCreator.updateInventorySlotLimit(type, updatedLimit));
+        }
+        return true;
     }
 
-    private int gainSlotsInternal(int type, int slots) {
+    private Integer gainSlotsInternal(int type, int slots) {
         inventory[type].lockInventory();
         try {
-            if (canGainSlots(type, slots)) {
-                int newLimit = inventory[type].getSlotLimit() + slots;
-                inventory[type].setSlotLimit(newLimit);
-                return newLimit;
-            } else {
-                return -1;
+            if (!canGainSlots(type, slots)) {
+                return null;
             }
+
+            int newLimit = inventory[type].getSlotLimit() + slots;
+            inventory[type].setSlotLimit(newLimit);
+            return newLimit;
         } finally {
             inventory[type].unlockInventory();
         }

src/main/java/client/command/CommandContext.java

@@ -1,5 +1,6 @@
 package client.command;
 
+import database.character.CharacterSaver;
 import database.drop.DropProvider;
 import server.shop.ShopFactory;
 import service.ChannelService;
@@ -8,9 +9,9 @@ import service.ChannelService;
  * @author Ponk
  */
 public record CommandContext(CommandsExecutor commandsExecutor, DropProvider dropProvider, ShopFactory shopFactory,
-                             ChannelService channelService) {
+                             CharacterSaver characterSaver, ChannelService channelService) {
 
     public CommandContext with(CommandsExecutor ce) {
-        return new CommandContext(ce, this.dropProvider, this.shopFactory, this.channelService);
+        return new CommandContext(ce, this.dropProvider, this.shopFactory, this.characterSaver, this.channelService);
     }
 }

src/main/java/client/command/commands/gm6/SaveAllCommand.java

@@ -41,7 +41,7 @@ public class SaveAllCommand extends Command {
         Character player = c.getPlayer();
         for (World world : Server.getInstance().getWorlds()) {
             for (Character chr : world.getPlayerStorage().getAllCharacters()) {
-                chr.saveCharToDB();
+                ctx.characterSaver().save(chr);
             }
         }
         String message = player.getName() + " used !saveall.";

src/main/java/client/command/commands/gm6/WarpWorldCommand.java

@@ -55,7 +55,7 @@ public class WarpWorldCommand extends Command {
                 player.getMap().removePlayer(player);//LOL FORGOT THIS ><
                 player.setSessionTransitionState();
                 player.setWorld(worldb);
-                player.saveCharToDB();//To set the new world :O (true because else 2 player instances are created, one in both worlds)
+                ctx.characterSaver().save(player);//To set the new world :O (true because else 2 player instances are created, one in both worlds)
                 c.sendPacket(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
             } catch (UnknownHostException | NumberFormatException ex) {
                 ex.printStackTrace();