Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix a rather insidious bug in the wrapped stack comparator that was causing incorrect energy values to be computed

Browse source
This commit is contained in:
Pahimar 2016-05-26 16:04:04 -04:00
parent 22337f0bbc
commit 79bf272f28
1 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/main/java/com/pahimar/ee3/exchange/WrappedStack.java
View file

@ -336,55 +336,68 @@ public class WrappedStack implements Comparable<WrappedStack> {
public int compare(WrappedStack wrappedStack1, WrappedStack wrappedStack2) public int compare(WrappedStack wrappedStack1, WrappedStack wrappedStack2)
{ {
if (wrappedStack1.wrappedStack instanceof ItemStack) if (wrappedStack1.wrappedStack instanceof ItemStack) {
{
if (wrappedStack2.wrappedStack instanceof ItemStack) if (wrappedStack2.wrappedStack instanceof ItemStack) {
{
return ItemHelper.compare((ItemStack) wrappedStack1.wrappedStack, (ItemStack) wrappedStack2.wrappedStack); int compareResult = ItemHelper.compare((ItemStack) wrappedStack1.wrappedStack, (ItemStack) wrappedStack2.wrappedStack);
if (compareResult == 0) {
return wrappedStack1.stackSize - wrappedStack2.stackSize;
}
else {
return compareResult;
}
} }
else else {
{
return 1; return 1;
} }
} }
else if (wrappedStack1.wrappedStack instanceof OreStack) else if (wrappedStack1.wrappedStack instanceof OreStack) {
{
if (wrappedStack2.wrappedStack instanceof ItemStack) if (wrappedStack2.wrappedStack instanceof ItemStack) {
{
return -1; return -1;
} }
else if (wrappedStack2.wrappedStack instanceof OreStack) else if (wrappedStack2.wrappedStack instanceof OreStack) {
{
return OreStack.compare((OreStack) wrappedStack1.wrappedStack, (OreStack) wrappedStack2.wrappedStack); int compareResult = OreStack.compare((OreStack) wrappedStack1.wrappedStack, (OreStack) wrappedStack2.wrappedStack);
if (compareResult == 0) {
return wrappedStack1.stackSize - wrappedStack2.stackSize;
}
else {
return compareResult;
}
} }
else else {
{
return 1; return 1;
} }
} }
else if (wrappedStack1.wrappedStack instanceof FluidStack) else if (wrappedStack1.wrappedStack instanceof FluidStack) {
{
if (wrappedStack2.wrappedStack instanceof ItemStack || wrappedStack2.wrappedStack instanceof OreStack) if (wrappedStack2.wrappedStack instanceof ItemStack || wrappedStack2.wrappedStack instanceof OreStack) {
{
return -1; return -1;
} }
else if (wrappedStack2.wrappedStack instanceof FluidStack) else if (wrappedStack2.wrappedStack instanceof FluidStack) {
{
return FluidHelper.compare((FluidStack) wrappedStack1.wrappedStack, (FluidStack) wrappedStack2.wrappedStack); int compareResult = FluidHelper.compare((FluidStack) wrappedStack1.wrappedStack, (FluidStack) wrappedStack2.wrappedStack);
if (compareResult == 0) {
return wrappedStack1.stackSize - wrappedStack2.stackSize;
}
else {
return compareResult;
}
} }
else else {
{
return 1; return 1;
} }
} }
else if (wrappedStack1.wrappedStack == null) else if (wrappedStack1.wrappedStack == null) {
{ if (wrappedStack2.wrappedStack != null) {
if (wrappedStack2.wrappedStack != null)
{
return -1; return -1;
} }
else else {
{
return 0; return 0;
} }
} }