From f7489f1526cb071c9642a2fad456f7a2f8a05732 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 15:20:27 -0400 Subject: [PATCH 1/3] Fix Side Only Issues --- .../kamkeel/npcs/network/packets/player/MailActionPacket.java | 1 - .../network/packets/request/feather/DimensionTeleportPacket.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java index eb5e12d97..06440e1f2 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java @@ -168,7 +168,6 @@ public class MailActionPacket extends AbstractPacket { } @Override - @SideOnly(Side.SERVER) protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException { if (!(player instanceof EntityPlayerMP)) return; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java index 65f18be9f..1104f837a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java @@ -46,7 +46,6 @@ public final class DimensionTeleportPacket extends AbstractPacket { out.writeInt(dimensionID); } - @SideOnly(Side.SERVER) @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { if (!(player instanceof EntityPlayerMP)) From 12ad5abba5fb886abb03238d4810ed8b0c2b4641 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 15:39:20 -0400 Subject: [PATCH 2/3] Improve Soulbind requirement apply logic --- .../types/SoulbindRequirement.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java index a8ceb2031..e38c1561b 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java +++ b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java @@ -4,6 +4,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import kamkeel.npcs.controllers.data.attribute.requirement.IRequirementChecker; +import kamkeel.npcs.controllers.ProfileController; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -83,7 +84,25 @@ public class SoulbindRequirement implements IRequirementChecker { @Override public void apply(NBTTagCompound nbt, Object value) { if (value instanceof String) { - nbt.setString(getKey(), (String) value); + String entry = (String) value; + if (entry.isEmpty()) + return; + + // Check if the provided value is already a valid UUID + UUID uuid = null; + try { + uuid = UUID.fromString(entry); + } catch (Exception ignored) { + } + + // If not a UUID, attempt to treat the value as a username + if (uuid == null) { + uuid = ProfileController.Instance.getUUIDFromUsername(entry); + } + + if (uuid != null) { + nbt.setString(getKey(), uuid.toString()); + } } } From 48518998daf4b08aaf67d26ea55afc573b5472ec Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 15:40:01 -0400 Subject: [PATCH 3/3] Update api --- src/api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api b/src/api index 9c67b3316..9ce413ee0 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 9c67b33169b6552974f9583d13cd7cd62784b6cc +Subproject commit 9ce413ee074f975378287f52b5aaf80105d297cd