diff --git a/build.properties b/build.properties index 325935e9..bd9787bf 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ mapping_channel=parchment mod_id=psi forge_version=43.3.0 jei_version=11.6.0.1013 -build_number=101 +build_number=102 patchy_version=1.19.2-77 dir_output=../Build Output/Psi/ version=1.19 diff --git a/src/main/java/vazkii/psi/common/core/handler/ContributorSpellCircleHandler.java b/src/main/java/vazkii/psi/common/core/handler/ContributorSpellCircleHandler.java index 5a9869de..e352ca18 100644 --- a/src/main/java/vazkii/psi/common/core/handler/ContributorSpellCircleHandler.java +++ b/src/main/java/vazkii/psi/common/core/handler/ContributorSpellCircleHandler.java @@ -69,7 +69,7 @@ public static boolean isContributor(String name) { @SubscribeEvent public static void onCadTake(CADTakeEvent event) { - if(ContributorSpellCircleHandler.isContributor(event.getPlayer().getName().getString().toLowerCase(Locale.ROOT)) && !((ICAD) event.getCad().getItem()).getComponentInSlot(event.getCad(), EnumCADComponent.DYE).isEmpty()) { + if(ContributorSpellCircleHandler.isContributor(event.getPlayer().getName().getString().toLowerCase(Locale.ROOT)) && !event.getCad().isEmpty() && !((ICAD) event.getCad().getItem()).getComponentInSlot(event.getCad(), EnumCADComponent.DYE).isEmpty()) { ItemStack dyeStack = ((ICAD) event.getCad().getItem()).getComponentInSlot(event.getCad(), EnumCADComponent.DYE); ((ICADColorizer) dyeStack.getItem()).setContributorName(dyeStack, event.getPlayer().getName().getString()); ItemCAD.setComponent(event.getCad(), dyeStack);