fix not being able to set blueprints to the construction markers
This commit is contained in:
parent
c432ebd2e5
commit
cbda740cba
3 changed files with 7 additions and 2 deletions
|
@ -80,9 +80,10 @@ public class BlockConstructionMarker extends BlockMarker {
|
||||||
} else if (equipped instanceof ItemConstructionMarker) {
|
} else if (equipped instanceof ItemConstructionMarker) {
|
||||||
if (ItemConstructionMarker.linkStarted(entityplayer.getCurrentEquippedItem())) {
|
if (ItemConstructionMarker.linkStarted(entityplayer.getCurrentEquippedItem())) {
|
||||||
ItemConstructionMarker.link(entityplayer.getCurrentEquippedItem(), world, x, y, z);
|
ItemConstructionMarker.link(entityplayer.getCurrentEquippedItem(), world, x, y, z);
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,7 +97,7 @@ public class BlockMarker extends BlockBuildCraft {
|
||||||
if (tile instanceof TileMarker) {
|
if (tile instanceof TileMarker) {
|
||||||
((TileMarker) tile).tryConnection();
|
((TileMarker) tile).tryConnection();
|
||||||
}
|
}
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -123,6 +123,10 @@ public abstract class ItemBlueprint extends ItemBuildCraft implements IBlueprint
|
||||||
}
|
}
|
||||||
|
|
||||||
LibraryId id = getId(stack);
|
LibraryId id = getId(stack);
|
||||||
|
if (id == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
NBTTagCompound nbt = BuildCraftBuilders.serverDB.load(id);
|
NBTTagCompound nbt = BuildCraftBuilders.serverDB.load(id);
|
||||||
BlueprintBase base;
|
BlueprintBase base;
|
||||||
if (((IBlueprintItem) stack.getItem()).getType(stack) == IBlueprintItem.Type.TEMPLATE) {
|
if (((IBlueprintItem) stack.getItem()).getType(stack) == IBlueprintItem.Type.TEMPLATE) {
|
||||||
|
|
Loading…
Reference in a new issue