From c28a312f3c91320b241610be149193a20722adf4 Mon Sep 17 00:00:00 2001 From: mlus <1319237806@qq.com> Date: Wed, 10 Sep 2025 16:05:54 +0800 Subject: [PATCH] clear curios before restore? --- .../java/vip/fubuki/playersync/sync/ModsSupport.java | 10 +++++----- .../fubuki/playersync/sync/chat/ChatSyncClient.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/vip/fubuki/playersync/sync/ModsSupport.java b/src/main/java/vip/fubuki/playersync/sync/ModsSupport.java index efb3882..b0397b9 100644 --- a/src/main/java/vip/fubuki/playersync/sync/ModsSupport.java +++ b/src/main/java/vip/fubuki/playersync/sync/ModsSupport.java @@ -7,6 +7,10 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fml.ModList; +import top.theillusivec4.curios.api.CuriosApi; +import top.theillusivec4.curios.api.type.capability.ICuriosItemHandler; +import top.theillusivec4.curios.api.type.inventory.ICurioStacksHandler; +import top.theillusivec4.curios.api.type.inventory.IDynamicStackHandler; import vip.fubuki.playersync.PlayerSync; import vip.fubuki.playersync.util.JDBCsetUp; import vip.fubuki.playersync.util.LocalJsonUtil; @@ -15,11 +19,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; - -import top.theillusivec4.curios.api.CuriosApi; -import top.theillusivec4.curios.api.type.capability.ICuriosItemHandler; -import top.theillusivec4.curios.api.type.inventory.ICurioStacksHandler; -import top.theillusivec4.curios.api.type.inventory.IDynamicStackHandler; import java.util.Optional; import java.util.UUID; @@ -59,6 +58,7 @@ public class ModsSupport { // Restore each saved item. handlerOpt.ifPresent(handler -> { + handler.getCurios().clear(); for (Map.Entry entry : storedMap.entrySet()) { String compositeKey = entry.getKey(); // Expected format: "slotType:index" String[] parts = compositeKey.split(":"); diff --git a/src/main/java/vip/fubuki/playersync/sync/chat/ChatSyncClient.java b/src/main/java/vip/fubuki/playersync/sync/chat/ChatSyncClient.java index 32f1c61..33379b3 100644 --- a/src/main/java/vip/fubuki/playersync/sync/chat/ChatSyncClient.java +++ b/src/main/java/vip/fubuki/playersync/sync/chat/ChatSyncClient.java @@ -32,7 +32,7 @@ public class ChatSyncClient { while ((serverMessage = in.readLine()) != null) { PlayerSync.LOGGER.info("Received message from chat server: " + serverMessage); Component textComponents = Component.nullToEmpty(serverMessage); - if(playerList!=null){ + if(playerList != null){ playerList.broadcastSystemMessage(textComponents,false); } }