Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed a potential CC Modification Error in item pipes

Browse source
This commit is contained in:
CovertJaguar 2012-10-18 18:03:17 -07:00
parent 8a73df84e4
commit 47d2cc68de
1 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
common/buildcraft/transport/PipeTransportItems.java
View file

@ -19,7 +19,6 @@ import java.util.Map;
import cpw.mods.fml.common.network.PacketDispatcher;
import buildcraft.BuildCraftCore;
import buildcraft.BuildCraftTransport;
import buildcraft.api.core.Orientations;
import buildcraft.api.core.Position;
@ -27,7 +26,6 @@ import buildcraft.api.gates.ITrigger;
import buildcraft.api.inventory.ISpecialInventory;
import buildcraft.api.transport.IPipeEntry;
import buildcraft.api.transport.IPipedItem;
import buildcraft.api.transport.PipeManager;
import buildcraft.core.DefaultProps;
import buildcraft.core.EntityPassiveItem;
import buildcraft.core.IMachine;
@ -114,6 +112,37 @@ public class PipeTransportItems extends PipeTransport {
}
}
/**
* Bounces the item back into the pipe without changing the travelingEntities map.
* @param data
*/
private void reverseItem(EntityData data) {
if (data.item.isCorrupted())
// Safe guard - if for any reason the item is corrupted at this
// stage, avoid adding it to the pipe to avoid further exceptions.
return;
data.toCenter = true;
data.input = data.output.reverse();
readjustSpeed(data.item);
// Reajusting Ypos to make sure the object looks like sitting on the
// pipe.
if (data.input != Orientations.YPos && data.input != Orientations.YNeg)
data.item.setPosition(data.item.getPosition().x, yCoord + Utils.getPipeFloorOf(data.item.getItemStack()), data.item.getPosition().z);
if (!worldObj.isRemote)
data.output = resolveDestination(data);
if (container.pipe instanceof IPipeTransportItemsHook)
((IPipeTransportItemsHook) container.pipe).entityEntered(data.item, data.input);
if (!worldObj.isRemote) {
sendItemPacket(data);
}
}
public Orientations resolveDestination(EntityData data) {
LinkedList<Orientations> listOfPossibleMovements = getPossibleMovements(data);
@ -271,10 +300,8 @@ public class PipeTransportItems extends PipeTransport {
data.item.getItemStack().stackSize -= added.stackSize;
if(data.item.getItemStack().stackSize > 0) {
data.toCenter = true;
data.input = data.output.reverse();
unscheduleRemoval(data.item);
entityEntering(data.item, data.output.reverse());
reverseItem(data);
}
}
} else {