fixed a duplicate copypsata

GregTech6 · Jun 13, 2024 · 681d45d · 681d45d
1 parent 6f814df
commit 681d45d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/main/java/gregapi/load/LoaderOreDictReRegistrations.java b/src/main/java/gregapi/load/LoaderOreDictReRegistrations.java
@@ -72,8 +72,6 @@ public void run() {
 		OreDictManager.INSTANCE.addAutoBlackListing("IngotEnrichedUranium");
 		OreDictManager.INSTANCE.addAutoBlackListing("blockSolidGlass");
 		OreDictManager.INSTANCE.addAutoBlackListing(OD.blockGlassColorless);
-		OreDictManager.INSTANCE.addAutoBlackListing(OD.blockGlassColorless);
-		OreDictManager.INSTANCE.addAutoBlackListing(OD.paneGlassColorless);
 		OreDictManager.INSTANCE.addAutoBlackListing(OD.paneGlassColorless);
 		OreDictManager.INSTANCE.addAutoBlackListing(OD.glassColorless);
 		OreDictManager.INSTANCE.addAutoBlackListing(OD.blockGlass);

diff --git a/src/main/java/gregapi/tileentity/inventories/MultiTileEntityMassStorage.java b/src/main/java/gregapi/tileentity/inventories/MultiTileEntityMassStorage.java
@@ -629,7 +629,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.mMaterial.mMaterial == aData.mMaterial.mMaterial && (!mData.mBlackListed || (mData.mMaterial.mMaterial != MT.Glass && MD.MC.owns(aStack) != MD.MC.owns(slot(1)))) && mPartialUnits < getUnitAmount(mData.mPrefix)) {
+		if (mData != null && aData != null && mData.validData() && aData.validData() && mData.mMaterial.mMaterial == aData.mMaterial.mMaterial && (!mData.mBlackListed || (mData.mMaterial.mMaterial != MT.Glass && 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;
 			}