Skip to content

Commit

Permalink
okay this one was too strict, it needs a vanilla exception
Browse files Browse the repository at this point in the history
  • Loading branch information
GregoriusT committed Dec 23, 2023
1 parent 70dabd9 commit 64b2f23
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import gregapi.code.ItemStackSet;
import gregapi.data.LH;
import gregapi.data.LH.Chat;
import gregapi.data.MD;
import gregapi.data.OP;
import gregapi.data.TD;
import gregapi.network.INetworkHandler;
Expand Down Expand Up @@ -631,7 +632,7 @@ public long getUnitAmount(OreDictPrefix aPrefix) {

public long getUnitAmount(ItemStack aStack) {
OreDictItemData mData = OM.anydata_(slot(1)), aData = OM.anydata_(aStack);
if (mData != null && aData != null && mData.validData() && aData.validData() && !mData.mBlackListed && !aData.mBlackListed && mData.mMaterial.mMaterial == aData.mMaterial.mMaterial && mPartialUnits < getUnitAmount(mData.mPrefix)) {
if (mData != null && aData != null && mData.validData() && aData.validData() && mData.mMaterial.mMaterial == aData.mMaterial.mMaterial && (!mData.mBlackListed || MD.MC.owns(slot(1))) && mPartialUnits < getUnitAmount(mData.mPrefix)) {
if (mData.mPrefix.contains(TD.Prefix.DUST_BASED)) {
return aData.mPrefix.contains(TD.Prefix.DUST_BASED) ? aData.mPrefix.mAmount : 0;
}
Expand Down

0 comments on commit 64b2f23

Please sign in to comment.