upstream/AE2FluidCraft-Rework
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git synced 2026-11-11 07:47:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from GlodBlock/1.7.10

Browse Source 
upstreamfix
This commit is contained in:
Yang Xizhi authored and GitHub committed 2022-07-29 20:44:20 +08:00
2 parents e241b75065 e8133a8522
commit 5ee263e9de
2 files changed
+9 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/glodblock/github/nei/NEIUtils.java
+2
View File
@@ -45,6 +45,8 @@ public class NEIUtils {
int upper = 0;
for (OrderStack<?> orderStack : list) {
if (orderStack != null && orderStack.getStack() != null) {
if (orderStack.getStack() instanceof ItemStack && ((ItemStack) orderStack.getStack()).stackSize == 0)
continue;
map.put(orderStack.getIndex(), orderStack.getStack());
upper = Math.max(upper, orderStack.getIndex());
}
src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java
+7 -5
View File
@@ -94,12 +94,14 @@ public class CPacketTransferRecipe implements IMessage {
outputSlot.setInventorySlotContents(i, null);
}
if (combine) {
message.inputs = NEIUtils.compress(message.inputs);
message.outputs = NEIUtils.compress(message.outputs);
if (!message.isCraft) {
if (combine) {
message.inputs = NEIUtils.compress(message.inputs);
message.outputs = NEIUtils.compress(message.outputs);
}
message.inputs = NEIUtils.clearNull(message.inputs);
message.outputs = NEIUtils.clearNull(message.outputs);
}
message.inputs = NEIUtils.clearNull(message.inputs);
message.outputs = NEIUtils.clearNull(message.outputs);
for (OrderStack<?> stack : message.inputs) {
if (stack != null) {