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

bugfix

Browse source
This commit is contained in:
asiekierka 2014-11-27 10:18:10 +01:00
parent ff999aa316
commit 2243221ae7
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/buildcraft/core/builders/BuildingSlotBlock.java
View file

@ -8,7 +8,9 @@
*/
package buildcraft.core.builders;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -18,9 +20,11 @@ import net.minecraftforge.common.util.Constants;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.MappingNotFoundException;
import buildcraft.api.blueprints.MappingRegistry;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.api.blueprints.SchematicBlockBase;
import buildcraft.api.blueprints.SchematicFactory;
import buildcraft.api.blueprints.SchematicMask;
import buildcraft.api.core.BCLog;
import buildcraft.api.core.Position;
public class BuildingSlotBlock extends BuildingSlot {
@ -67,6 +71,24 @@ public class BuildingSlotBlock extends BuildingSlot {
if (e != null) {
e.updateEntity();
}
// This is slightly hackish, but it's a very important way to verify
// the stored requirements.
if (getSchematic() instanceof SchematicBlock) {
SchematicBlock sb = (SchematicBlock) getSchematic();
// Copy the old array of stored requirements.
List<ItemStack> oldRequirements = Arrays.asList(sb.storedRequirements);
sb.storedRequirements = new ItemStack[0];
sb.storeRequirements(context, x, y, z);
for (ItemStack s : sb.storedRequirements) {
if (!oldRequirements.contains(s)) {
BCLog.logger.warn("Blueprint has MISMATCHING REQUIREMENTS! Potential corrupted/hacked blueprint! Removed mismatched block.");
context.world().setBlockToAir(x, y, z);
return;
}
}
}
} catch (Throwable t) {
t.printStackTrace();
context.world().setBlockToAir(x, y, z);

3
common/buildcraft/core/builders/BuildingSlotEntity.java
View file

@ -8,7 +8,9 @@
*/
package buildcraft.core.builders;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -18,6 +20,7 @@ import buildcraft.api.blueprints.MappingNotFoundException;
import buildcraft.api.blueprints.MappingRegistry;
import buildcraft.api.blueprints.SchematicEntity;
import buildcraft.api.blueprints.SchematicFactory;
import buildcraft.api.core.BCLog;
import buildcraft.api.core.Position;
public class BuildingSlotEntity extends BuildingSlot {