fix default magic data attachment having null server player

iron431 · Aug 10, 2024 · ed5f147 · ed5f147
1 parent 38816db
commit ed5f147
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/io/redspace/ironsspellbooks/registries/DataAttachmentRegistry.java b/src/main/java/io/redspace/ironsspellbooks/registries/DataAttachmentRegistry.java
@@ -4,6 +4,7 @@
 import io.redspace.ironsspellbooks.IronsSpellbooks;
 import io.redspace.ironsspellbooks.api.magic.MagicData;
 import io.redspace.ironsspellbooks.capabilities.magic.PlayerMagicProvider;
+import net.minecraft.server.level.ServerPlayer;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.neoforge.attachment.AttachmentType;
 import net.neoforged.neoforge.registries.DeferredHolder;
@@ -18,5 +19,6 @@ public static void register(IEventBus eventBus) {
         ATTACHMENT_TYPES.register(eventBus);
     }
 
-    public static final DeferredHolder<AttachmentType<?>, AttachmentType<MagicData>> MAGIC_DATA = ATTACHMENT_TYPES.register("magic_data", () -> AttachmentType.builder(() -> new MagicData()).serialize(new PlayerMagicProvider()).build());
+    public static final DeferredHolder<AttachmentType<?>, AttachmentType<MagicData>> MAGIC_DATA = ATTACHMENT_TYPES.register("magic_data",
+            () -> AttachmentType.builder((holder) -> holder instanceof ServerPlayer serverPlayer ? new MagicData(serverPlayer) : new MagicData()).serialize(new PlayerMagicProvider()).build());
 }